Handle integer 64 for QVariant. Fix #36412.

ismailsunni · nyalldawson · commit 39cbb33fc15d · 2020-05-18T07:50:22.000+10:00
diff --git a/src/core/expression/qgsexpressionfunction.cpp b/src/core/expression/qgsexpressionfunction.cpp
@@ -434,6 +434,17 @@ static QVariant fcnRnd( const QVariantList &values, const QgsExpressionContext *
     generator.seed( seed );
   }
 
+  qint64 randomInteger = min + ( generator() % ( max - min + 1 ) );
+  if ( randomInteger  > std::numeric_limits<int>::max() || randomInteger < -std::numeric_limits<int>::max() )
+  {
+    return QVariant( randomInteger );
+  }
+  else
+  {
+    // Prevent wrong conversion of QVariant. See #36412
+    return QVariant( int( randomInteger ) );
+  }
+
   // Return a random integer in the range [min, max] (inclusive)
   return QVariant( min + ( generator() % ( max - min + 1 ) ) );
 }
