Fix crash when stored scale list contains invalid values

nyalldawson · github-actions[bot] · commit e90fb7898f2f · 2023-03-29T09:29:07.000Z
Can happen as a result of invalid settings being written by
QGIS 3.30.0
diff --git a/src/gui/qgsscalecombobox.cpp b/src/gui/qgsscalecombobox.cpp
@@ -60,13 +60,14 @@ void QgsScaleComboBox::updateScales( const QStringList &scales )
     }
   }
 
-  QStringList parts;
-  double denominator;
-  bool ok;
   for ( int i = 0; i < myScalesList.size(); ++i )
   {
-    parts = myScalesList[ i ] .split( ':' );
-    denominator = QLocale().toDouble( parts[1], &ok );
+    const QStringList parts = myScalesList[ i ] .split( ':' );
+    if ( parts.size() < 2 )
+      continue;
+
+    bool ok = false;
+    const double denominator = QLocale().toDouble( parts[1], &ok );
     if ( ok )
     {
       myScalesList[ i ] = toString( denominator );

Original file line number	Diff line number	Diff line change
`@@ -60,13 +60,14 @@ void QgsScaleComboBox::updateScales( const QStringList &scales )`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`		`- QStringList parts;`
`64`		`- double denominator;`
`65`		`- bool ok;`
`66`	`63`	`for ( int i = 0; i < myScalesList.size(); ++i )`
`67`	`64`	`{`
`68`		`- parts = myScalesList[ i ] .split( ':' );`
`69`		`- denominator = QLocale().toDouble( parts[1], &ok );`
	`65`	`+ const QStringList parts = myScalesList[ i ] .split( ':' );`
	`66`	`+ if ( parts.size() < 2 )`
	`67`	`+ continue;`
	`68`	`+`
	`69`	`+ bool ok = false;`
	`70`	`+ const double denominator = QLocale().toDouble( parts[1], &ok );`
`70`	`71`	`if ( ok )`
`71`	`72`	`{`
`72`	`73`	`myScalesList[ i ] = toString( denominator );`