Add check for int overflow on 32 bit systems

qgis · Nov 27, 2018 · b3ed482 · b3ed482
1 parent d3d1805
commit b3ed482
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
@@ -848,6 +848,15 @@ void QgsGdalProvider::readBlock( int bandNo, QgsRectangle  const &extent, int pi
 
   // Allocate temporary block
   size_t bufferSize = dataSize * static_cast<size_t>( tmpWidth ) * static_cast<size_t>( tmpHeight );
+#ifdef Q_PROCESSOR_X86_32
+  // Safety check for 32 bit systems
+  qint64 _buffer_size = dataSize * static_cast<qint64>( tmpWidth ) * static_cast<qint64>( tmpHeight );
+  if ( _buffer_size != static_cast<qint64>( bufferSize ) )
+  {
+    QgsDebugMsg( QStringLiteral( "Integer overflow calculating buffer size on a 32 bit system." ) );
+    return;
+  }
+#endif
   char *tmpBlock = static_cast<char *>( qgsMalloc( bufferSize ) );
   if ( ! tmpBlock )
   {