commit e1200376cc2bb4bb1f3e71462df9d68f359e8b84
author dirk <dirk@git.imagemagick.org> Sun Jun 19 12:27:18 2016 +0200
committer dirk <dirk@git.imagemagick.org> Sun Jun 19 12:36:38 2016 +0200
tree 6489d3a3575d5ca7b0f944f8e23adc473ece671a
parent c0a9bafa01df271ed8a95986209e1e85aeb3cb66

Added extra null checks and tests for the result codes of OpenCL calls.

MagickCore/opencl.c

diff --git a/MagickCore/opencl.c b/MagickCore/opencl.c
index 46cf551..195948a 100644
--- a/MagickCore/opencl.c
+++ b/MagickCore/opencl.c
@@ -457,7 +457,7 @@
 MagickPrivate cl_mem CreateOpenCLBuffer(MagickCLDevice device,
   cl_mem_flags flags, size_t size, void *host_ptr)
 {
-  return(openCL_library->clCreateBuffer(device->context, flags, size, host_ptr,
+  return(openCL_library->clCreateBuffer(device->context,flags,size,host_ptr,
     (cl_int *) NULL));
 }
 
@@ -508,6 +508,9 @@
 MagickPrivate MagickCLCacheInfo AcquireMagickCLCacheInfo(MagickCLDevice device,
   Quantum *pixels,const MagickSizeType length)
 {
+  cl_int
+    status;
+
   MagickCLCacheInfo
     info;
 
@@ -522,8 +525,13 @@
   info->length=length;
   info->pixels=pixels;
   info->buffer=openCL_library->clCreateBuffer(device->context,
-    CL_MEM_USE_HOST_PTR,(size_t) length,(void *) pixels,NULL);
-  return(info);
+    CL_MEM_USE_HOST_PTR,(size_t) length,(void *) pixels,&status);
+  if (status == CL_SUCCESS)
+    return(info);
+  LockSemaphoreInfo(openCL_lock);
+  device->requested--;
+  UnlockSemaphoreInfo(openCL_lock);
+  return((MagickCLCacheInfo) RelinquishMagickMemory(info));
 }
 
 /*
@@ -645,7 +653,7 @@
     if (device->profile_kernels != MagickFalse)
       properties=CL_QUEUE_PROFILING_ENABLE;
     queue=openCL_library->clCreateCommandQueue(device->context,
-      device->deviceID,properties,NULL);
+      device->deviceID,properties,(cl_int *) NULL);
   }
   return(queue);
 }
@@ -681,14 +689,12 @@
 MagickPrivate cl_kernel AcquireOpenCLKernel(MagickCLDevice device,
   const char *kernel_name)
 {
-  cl_int
-    status;
-
   cl_kernel
     kernel;
 
   assert(device != (MagickCLDevice) NULL);
-  kernel=openCL_library->clCreateKernel(device->program,kernel_name,&status);
+  kernel=openCL_library->clCreateKernel(device->program,kernel_name,
+    (cl_int *) NULL);
   return(kernel);
 }
 
@@ -1649,8 +1655,8 @@
   if (status != CL_SUCCESS)
     {
       (void) OpenCLThrowMagickException(input_info->opencl->device,exception,
-      GetMagickModule(),ResourceLimitWarning,"clEnqueueNDRangeKernel failed.",
-      "'%s'",".");
+        GetMagickModule(),ResourceLimitWarning,
+        "clEnqueueNDRangeKernel failed.","'%s'",".");
       return(MagickFalse);
     }
   RegisterCacheEvent(input_info->opencl,event);
@@ -2825,8 +2831,6 @@
 %    o device: the OpenCL device.
 %
 %    o queue: the OpenCL queue to be released.
-%
-%
 */
 
 MagickPrivate void RelinquishOpenCLCommandQueue(MagickCLDevice device,
@@ -2838,7 +2842,7 @@
   assert(device != (MagickCLDevice) NULL);
   LockSemaphoreInfo(device->lock);
   if ((device->profile_kernels != MagickFalse) ||
-      (device->command_queues_index >= MAGICKCORE_OPENCL_COMMAND_QUEUES - 1))
+      (device->command_queues_index >= MAGICKCORE_OPENCL_COMMAND_QUEUES-1))
     {
       UnlockSemaphoreInfo(device->lock);
       openCL_library->clFinish(queue);
@@ -2846,7 +2850,7 @@
     }
   else
     {
-      device->command_queues[++device->command_queues_index] = queue;
+      device->command_queues[++device->command_queues_index]=queue;
       UnlockSemaphoreInfo(device->lock);
     }
 }