From 8cf8d490d6b81c2b8ca6eb4a4852ffb2606b12c2 Mon Sep 17 00:00:00 2001 From: Simeon Date: Thu, 25 Oct 2018 23:05:18 +0200 Subject: Fix bug in for loop that can lead to segfault In case of big log files, where MAX_TANK_INFO is reached, tank_info[i] != NULL should be checked after i --- desktop-widgets/preferences/preferences_defaults.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/preferences/preferences_defaults.cpp b/desktop-widgets/preferences/preferences_defaults.cpp index 4d8c2a7e1..7ea704b96 100644 --- a/desktop-widgets/preferences/preferences_defaults.cpp +++ b/desktop-widgets/preferences/preferences_defaults.cpp @@ -84,7 +84,7 @@ void PreferencesDefaults::refreshSettings() ui->localDefaultFile->setChecked(qPrefGeneral::default_file_behavior() == LOCAL_DEFAULT_FILE); ui->default_cylinder->clear(); - for (int i = 0; tank_info[i].name != NULL && i < MAX_TANK_INFO; i++) { + for (int i = 0; i < MAX_TANK_INFO && tank_info[i].name != NULL; i++) { ui->default_cylinder->addItem(tank_info[i].name); if (qPrefGeneral::default_cylinder() == tank_info[i].name) ui->default_cylinder->setCurrentIndex(i); -- cgit v1.2.3-70-g09d2