]> granicus.if.org Git - imagemagick/commitdiff
Added missing null check.
authorDirk Lemstra <dirk@git.imagemagick.org>
Sat, 30 Sep 2017 08:05:05 +0000 (10:05 +0200)
committerDirk Lemstra <dirk@git.imagemagick.org>
Sat, 30 Sep 2017 08:05:30 +0000 (10:05 +0200)
MagickCore/opencl.c

index be678903a7bf0d3a75102cc8e6d40cd045bd9f07..bee3a43e3b64bd8d3d7cdc4e1654ceba8a3f48a8 100644 (file)
@@ -1401,13 +1401,18 @@ static cl_event* CopyOpenCLEvents(MagickCLCacheInfo first,
   if (*event_count > 0)
     {
       events=AcquireQuantumMemory(*event_count,sizeof(*events));
-      j=0;
-      for (i=0; i < first->event_count; i++, j++)
-        events[j]=first->events[i];
-      if (second != (MagickCLCacheInfo) NULL)
+      if (events == (MagickCLCacheInfo) NULL)
+        *event_count=0;
+      else
         {
-          for (i=0; i < second->event_count; i++, j++)
-            events[j]=second->events[i];
+          j=0;
+          for (i=0; i < first->event_count; i++, j++)
+            events[j]=first->events[i];
+          if (second != (MagickCLCacheInfo) NULL)
+            {
+              for (i=0; i < second->event_count; i++, j++)
+                events[j]=second->events[i];
+            }
         }
     }
   UnlockSemaphoreInfo(first->events_semaphore);