File ImageMagick-CVE-2016-7513.patch of Package ImageMagick

Overview Repositories Revisions Requests Users Attributes Meta

File ImageMagick-CVE-2016-7513.patch of Package ImageMagick

From a54fe0e8600eaf3dc6fe717d3c0398001507f723 Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 16 Dec 2014 12:24:08 +0000
Subject: [PATCH]

---
 magick/cache.c | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

Index: ImageMagick-6.8.8-1/magick/cache.c
===================================================================
--- ImageMagick-6.8.8-1.orig/magick/cache.c	2016-09-29 14:42:48.492802185 +0200
+++ ImageMagick-6.8.8-1/magick/cache.c	2016-09-29 14:44:47.766729984 +0200
@@ -580,29 +580,6 @@ MagickExport void ClonePixelCacheMethods
 %
 */
 
-static inline void CopyPixels(PixelPacket *destination,
-  const PixelPacket *source,const MagickSizeType number_pixels)
-{
-#if !defined(MAGICKCORE_OPENMP_SUPPORT) || (MAGICKCORE_QUANTUM_DEPTH <= 8)
-  (void) memcpy(destination,source,(size_t) number_pixels*sizeof(*source));
-#else
-  {
-    register MagickOffsetType
-      i;
-
-    if ((number_pixels*sizeof(*source)) < MagickMaxBufferExtent)
-      {
-        (void) memcpy(destination,source,(size_t) number_pixels*
-          sizeof(*source));
-        return;
-      }
-    #pragma omp parallel for
-    for (i=0; i < (MagickOffsetType) number_pixels; i++)
-      destination[i]=source[i];
-  }
-#endif
-}
-
 static inline MagickSizeType MagickMin(const MagickSizeType x,
   const MagickSizeType y)
 {
@@ -648,8 +625,8 @@ static MagickBooleanType ClonePixelCache
       /*
         Identical pixel cache morphology.
       */
-      CopyPixels(clone_info->pixels,cache_info->pixels,cache_info->columns*
-        cache_info->rows);
+      (void) memcpy(clone_info->pixels,cache_info->pixels,cache_info->columns*
+        cache_info->rows*sizeof(*cache_info->pixels));
       if (cache_info->active_index_channel != MagickFalse)
         (void) memcpy(clone_info->indexes,cache_info->indexes,
           cache_info->columns*cache_info->rows*sizeof(*cache_info->indexes));

Places

File ImageMagick-CVE-2016-7513.patch of Package ImageMagick

Places