Fix crash in raster calculator on Windows builds

It's not safe to take the data from a vector like this, it will be deleted as soon as the vector itself is Fixes #32855 (cherry picked from commit e3d2dcd)
qgis · Nov 26, 2019 · 3af8993 · 3af8993
1 parent 6d9fe0b
commit 3af8993
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/analysis/raster/qgsrastercalcnode.cpp b/src/analysis/raster/qgsrastercalcnode.cpp
@@ -60,6 +60,7 @@ bool QgsRasterCalcNode::calculate( QMap<QString, QgsRasterBlock * > &rasterData,
     QMap<QString, QgsRasterBlock *>::iterator it = rasterData.find( mRasterName );
     if ( it == rasterData.end() )
     {
+      QgsDebugMsg( QStringLiteral( "Error: could not find raster data for \"%1\"" ).arg( mRasterName ) );
       return false;
     }
 
@@ -190,9 +191,10 @@ bool QgsRasterCalcNode::calculate( QMap<QString, QgsRasterBlock * > &rasterData,
   else if ( mType == tNumber )
   {
     size_t nEntries = static_cast<size_t>( result.nColumns() * result.nRows() );
-    std::vector<double> *data = new  std::vector<double>( nEntries );
-    std::fill( std::begin( *data ), std::end( *data ), mNumber );
-    result.setData( result.nColumns(), 1, data->data(), result.nodataValue() );
+    double *data = new double[ nEntries ];
+    std::fill( data, data + nEntries, mNumber );
+    result.setData( result.nColumns(), 1, data, result.nodataValue() );
+
     return true;
   }
   else if ( mType == tMatrix )