Use better approach for malloc size safety (logic ported from GDAL)

Fixes #47097
qgis · Feb 1, 2022 · 0021306 · 0021306
1 parent ac9fd15
commit 0021306
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/core/qgis.cpp b/src/core/qgis.cpp
@@ -91,11 +91,18 @@ qlonglong qgsPermissiveToLongLong( QString string, bool &ok )
 
 void *qgsMalloc( size_t size )
 {
-  if ( size == 0 || long( size ) < 0 )
+  if ( size == 0 )
   {
-    QgsDebugMsg( QStringLiteral( "Negative or zero size %1." ).arg( size ) );
+    QgsDebugMsg( QStringLiteral( "Zero size requested" ) );
     return nullptr;
   }
+
+  if ( ( size >> ( 8 * sizeof( size ) - 1 ) ) != 0 )
+  {
+    QgsDebugMsg( QStringLiteral( "qgsMalloc - bad size requested: %1" ).arg( size ) );
+    return nullptr;
+  }
+
   void *p = malloc( size );
   if ( !p )
   {