Fixed issue reported in #780.

ImageMagick · Sep 25, 2017 · 6017a80 · 6017a80
1 parent 14be5f7
commit 6017a80
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/MagickCore/resample-private.h b/MagickCore/resample-private.h
@@ -55,13 +55,16 @@ static inline ResampleFilter **AcquireResampleFilterThreadSet(
   filter=(ResampleFilter **) AcquireQuantumMemory(number_threads,
     sizeof(*filter));
   if (filter == (ResampleFilter **) NULL)
-    return((ResampleFilter **) NULL);
+     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
   (void) ResetMagickMemory(filter,0,number_threads*sizeof(*filter));
   for (i=0; i < (ssize_t) number_threads; i++)
   {
     filter[i]=AcquireResampleFilter(image,exception);
     if (filter[i] == (ResampleFilter *) NULL)
-      return(DestroyResampleFilterThreadSet(filter));
+      {
+        filter=DestroyResampleFilterThreadSet(filter);
+        ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
+      }
     if (method != UndefinedVirtualPixelMethod)
       (void) SetResampleFilterVirtualPixelMethod(filter[i],method);
     if (interpolate != MagickFalse)