Always detach images before modifying them in threads

Fixes potential crash when colorizing or applying other effects to images Fixes #46304
qgis · Dec 3, 2021 · e95e892 · e95e892
1 parent 21573a5
commit e95e892
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/core/effects/qgsimageoperation.cpp b/src/core/effects/qgsimageoperation.cpp
@@ -199,6 +199,7 @@ void QgsImageOperation::convertToGrayscale( QImage &image, const GrayscaleMode m
     return;
   }
 
+  image.detach();
   GrayscalePixelOperation operation( mode );
   runPixelOperation( image, operation, feedback );
 }
@@ -254,6 +255,7 @@ void QgsImageOperation::grayscaleAverageOp( QRgb &rgb )
 
 void QgsImageOperation::adjustBrightnessContrast( QImage &image, const int brightness, const double contrast, QgsFeedback *feedback )
 {
+  image.detach();
   BrightnessContrastPixelOperation operation( brightness, contrast );
   runPixelOperation( image, operation, feedback );
 }
@@ -277,6 +279,7 @@ int QgsImageOperation::adjustColorComponent( int colorComponent, int brightness,
 
 void QgsImageOperation::adjustHueSaturation( QImage &image, const double saturation, const QColor &colorizeColor, const double colorizeStrength, QgsFeedback *feedback )
 {
+  image.detach();
   HueSaturationPixelOperation operation( saturation, colorizeColor.isValid() && colorizeStrength > 0.0,
                                          colorizeColor.hue(), colorizeColor.saturation(), colorizeStrength );
   runPixelOperation( image, operation, feedback );
@@ -341,6 +344,7 @@ void QgsImageOperation::multiplyOpacity( QImage &image, const double factor, Qgs
     //decreasing opacity - we can use the faster DestinationIn composition mode
     //to reduce the alpha channel
     QColor transparentFillColor = QColor( 0, 0, 0, 255 * factor );
+    image.detach();
     QPainter painter( &image );
     painter.setCompositionMode( QPainter::CompositionMode_DestinationIn );
     painter.fillRect( 0, 0, image.width(), image.height(), transparentFillColor );
@@ -349,6 +353,7 @@ void QgsImageOperation::multiplyOpacity( QImage &image, const double factor, Qgs
   else
   {
     //increasing opacity - run this as a pixel operation for multithreading
+    image.detach();
     MultiplyOpacityPixelOperation operation( factor );
     runPixelOperation( image, operation, feedback );
   }
@@ -370,6 +375,7 @@ void QgsImageOperation::overlayColor( QImage &image, const QColor &color )
 
   //use QPainter SourceIn composition mode to overlay color (fast)
   //this retains image's alpha channel but replaces color
+  image.detach();
   QPainter painter( &image );
   painter.setCompositionMode( QPainter::CompositionMode_SourceIn );
   painter.fillRect( 0, 0, image.width(), image.height(), opaqueColor );
@@ -391,6 +397,7 @@ void QgsImageOperation::distanceTransform( QImage &image, const DistanceTransfor
   if ( feedback && feedback->isCanceled() )
     return;
 
+  image.detach();
   ConvertToArrayPixelOperation convertToArray( image.width(), array.get(), properties.shadeExterior );
   runPixelOperation( image, convertToArray, feedback );
   if ( feedback && feedback->isCanceled() )
@@ -598,6 +605,10 @@ void QgsImageOperation::stackBlur( QImage &image, const int radius, const bool a
     convertedImage = std::make_unique< QImage >( image.convertToFormat( QImage::Format_ARGB32 ) );
     pImage = convertedImage.get();
   }
+  else
+  {
+    image.detach();
+  }
 
   if ( feedback && feedback->isCanceled() )
     return;
@@ -662,6 +673,10 @@ QImage *QgsImageOperation::gaussianBlur( QImage &image, const int radius, QgsFee
     convertedImage = std::make_unique< QImage >( image.convertToFormat( QImage::Format_ARGB32_Premultiplied ) );
     pImage = convertedImage.get();
   }
+  else
+  {
+    image.detach();
+  }
   if ( feedback && feedback->isCanceled() )
     return new QImage();
 
@@ -827,6 +842,7 @@ double *QgsImageOperation::createGaussianKernel( const int radius )
 
 void QgsImageOperation::flipImage( QImage &image, QgsImageOperation::FlipType type )
 {
+  image.detach();
   FlipLineOperation flipOperation( type == QgsImageOperation::FlipHorizontal ? QgsImageOperation::ByRow : QgsImageOperation::ByColumn );
   runLineOperation( image, flipOperation );
 }

diff --git a/src/core/symbology/qgsmarkersymbollayer.cpp b/src/core/symbology/qgsmarkersymbollayer.cpp
@@ -2970,7 +2970,9 @@ void QgsRasterMarkerSymbolLayer::renderPoint( QPointF point, QgsSymbolRenderCont
   if ( !img.isNull() )
   {
     if ( context.selected() )
+    {
       QgsImageOperation::adjustHueSaturation( img, 1.0, context.renderContext().selectionColor(), 1.0, context.renderContext().feedback() );
+    }
 
     const bool prevSmoothTransform = p->testRenderHint( QPainter::RenderHint::SmoothPixmapTransform );
     p->setRenderHint( QPainter::RenderHint::SmoothPixmapTransform, true );