commit 8286445471909c88b0f320e6ed40f67f2e3b464a
author Cristy <mikayla-grace@urban-warrior.org> Sun Jun 07 08:20:36 2020 -0400
committer Cristy <mikayla-grace@urban-warrior.org> Sun Jun 07 08:20:36 2020 -0400
tree fc45065ad052fa252c1eec0d4ee06491b7b09fbf
parent b33b15a05d54d6ac81a70ca2c4cfa9e538ed3176

https://github.com/ImageMagick/CodeScanImageMagickTest/security/code-scanning/21

MagickCore/effect.c

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 4e80952..382fff2 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -1686,7 +1686,7 @@
 
   float
     *interImage,
-    *scanLinePixels,
+    *scanline,
     totalWeight;
 
   Image
@@ -1696,7 +1696,7 @@
     status;
 
   MemoryInfo
-    *scanLinePixels_info,
+    *scanline_info,
     *interImage_info;
 
   ssize_t
@@ -1730,16 +1730,16 @@
   scanLineSize=(ssize_t) MagickMax(image->columns,image->rows);
   width=(ssize_t) scanLineSize*0.002f*fabs(radius);
   scanLineSize+=(2*width);
-  scanLinePixels_info=AcquireVirtualMemory((size_t) GetOpenMPMaximumThreads()*
-    scanLineSize,sizeof(*scanLinePixels));
-  if (scanLinePixels_info == (MemoryInfo *) NULL)
+  scanline_info=AcquireVirtualMemory((size_t) GetOpenMPMaximumThreads()*
+    scanLineSize,sizeof(*scanline));
+  if (scanline_info == (MemoryInfo *) NULL)
     {
       contrast_view=DestroyCacheView(contrast_view);
       image_view=DestroyCacheView(image_view);
       contrast_image=DestroyImage(contrast_image);
       ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
     }
-  scanLinePixels=(float *) GetVirtualMemoryBlob(scanLinePixels_info);
+  scanline=(float *) GetVirtualMemoryBlob(scanline_info);
   /*
     Create intermediate buffer.
   */
@@ -1747,7 +1747,7 @@
     sizeof(*interImage));
   if (interImage_info == (MemoryInfo *) NULL)
     {
-      scanLinePixels_info=RelinquishVirtualMemory(scanLinePixels_info);
+      scanline_info=RelinquishVirtualMemory(scanline_info);
       contrast_view=DestroyCacheView(contrast_view);
       image_view=DestroyCacheView(image_view);
       contrast_image=DestroyImage(contrast_image);
@@ -1788,7 +1788,7 @@
 
       if (status == MagickFalse)
         continue;
-      pixels=scanLinePixels;
+      pixels=scanline;
       pixels+=id*scanLineSize;
       pix=pixels;
       p=GetCacheViewVirtualPixels(image_view,x,-width,1,image->rows+(2*width),
@@ -1869,7 +1869,7 @@
 
       if (status == MagickFalse)
         continue;
-      pixels=scanLinePixels;
+      pixels=scanline;
       pixels+=id*scanLineSize;
       p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
       q=GetCacheViewAuthenticPixels(contrast_view,0,y,image->columns,1,
@@ -1911,16 +1911,16 @@
         mult=(srcVal+mult)/srcVal;
         traits=GetPixelChannelTraits(image,RedPixelChannel);
         if ((traits & UpdatePixelTrait) != 0)
-          SetPixelRed(contrast_image,ClampToQuantum(GetPixelRed(image,p)*mult),
-            q);
+          SetPixelRed(contrast_image,ClampToQuantum((MagickRealType)
+            GetPixelRed(image,p)*mult),q);
         traits=GetPixelChannelTraits(image,GreenPixelChannel);
         if ((traits & UpdatePixelTrait) != 0)
-          SetPixelGreen(contrast_image,ClampToQuantum(GetPixelGreen(image,p)*
-            mult),q);
+          SetPixelGreen(contrast_image,ClampToQuantum((MagickRealType)
+            GetPixelGreen(image,p)*mult),q);
         traits=GetPixelChannelTraits(image,BluePixelChannel);
         if ((traits & UpdatePixelTrait) != 0)
-          SetPixelBlue(contrast_image,ClampToQuantum(GetPixelBlue(image,p)*
-            mult),q);
+          SetPixelBlue(contrast_image,ClampToQuantum((MagickRealType)
+            GetPixelBlue(image,p)*mult),q);
         p+=image->number_channels;
         q+=contrast_image->number_channels;
       }
@@ -1928,7 +1928,7 @@
         status=MagickFalse;
     }
   }
-  scanLinePixels_info=RelinquishVirtualMemory(scanLinePixels_info);
+  scanline_info=RelinquishVirtualMemory(scanline_info);
   interImage_info=RelinquishVirtualMemory(interImage_info);
   contrast_view=DestroyCacheView(contrast_view);
   image_view=DestroyCacheView(image_view);