Avoid undefined behaviour with signed integer overflow

qgis · Feb 14, 2019 · 3ef1605 · 3ef1605
1 parent 0d178aa
commit 3ef1605
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/gui/editorwidgets/qgsrangewidgetwrapper.cpp b/src/gui/editorwidgets/qgsrangewidgetwrapper.cpp
@@ -144,12 +144,12 @@ void QgsRangeWidgetWrapper::initWidget( QWidget *editor )
     int minval = min.toInt();
     if ( allowNull )
     {
-      int stepval = step.isValid() ? step.toInt() : 1;
+      uint stepval = step.isValid() ? step.toUInt() : 1;
-      int newMinval = minval - stepval;
       // make sure there is room for a new value (i.e. signed integer does not overflow)
-      if ( newMinval < minval )
+      int minvalOverflow = uint( minval ) - stepval;
+      if ( minvalOverflow < minval )
       {
-        minval = newMinval;
+        minval = minvalOverflow;
       }
       mIntSpinBox->setValue( minval );
       QgsSpinBox *intSpinBox( qobject_cast<QgsSpinBox *>( mIntSpinBox ) );