From a38d165a0a8f708f592552458fbcf269107a2c3d Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Sat, 30 Sep 2017 10:05:05 +0200 Subject: [PATCH] Added missing null check. --- MagickCore/opencl.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/MagickCore/opencl.c b/MagickCore/opencl.c index be678903a..bee3a43e3 100644 --- a/MagickCore/opencl.c +++ b/MagickCore/opencl.c @@ -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); -- 2.40.0