]> granicus.if.org Git - imagemagick/commitdiff
Added null check for issue reported in #792
authorDirk Lemstra <dirk@git.imagemagick.org>
Wed, 4 Oct 2017 04:55:57 +0000 (06:55 +0200)
committerDirk Lemstra <dirk@git.imagemagick.org>
Wed, 4 Oct 2017 04:55:57 +0000 (06:55 +0200)
MagickCore/opencl.c

index a3e972cf4d18a06344ad3bf4689dc63de9ad5e7a..dee6c021a5546541c482aa5b1421dbed869b57f7 100644 (file)
@@ -1249,8 +1249,13 @@ static void CacheOpenCLKernel(MagickCLDevice device,char *filename,
     CL_PROGRAM_BINARY_SIZES,sizeof(size_t),&binaryProgramSize,NULL);
   if (status != CL_SUCCESS)
     return;
-
   binaryProgram=(unsigned char*) AcquireMagickMemory(binaryProgramSize);
+  if (binaryProgram == (unsigned char *) NULL)
+    {
+      (void) ThrowMagickException(exception,GetMagickModule(),
+        ResourceLimitError,"MemoryAllocationFailed","`%s'",filename);
+      return;
+    }
   status=openCL_library->clGetProgramInfo(device->program,
     CL_PROGRAM_BINARIES,sizeof(unsigned char*),&binaryProgram,NULL);
   if (status == CL_SUCCESS)