From 9155e0c7c6696ec8c657e32bf41a08f88a8f3d0d Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 15 Oct 2019 13:16:17 -0400 Subject: [PATCH] mi: Fix undefined memcpy in mieqGrowQueue The first time we get here, eventQueue->events is NULL. --- mi/mieq.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mi/mieq.c b/mi/mieq.c index 157724b2d..09b71b639 100644 --- a/mi/mieq.c +++ b/mi/mieq.c @@ -126,11 +126,13 @@ mieqGrowQueue(EventQueuePtr eventQueue, size_t new_nevents) /* First copy the existing events */ first_hunk = eventQueue->nevents - eventQueue->head; - memcpy(new_events, - &eventQueue->events[eventQueue->head], - first_hunk * sizeof(EventRec)); - memcpy(&new_events[first_hunk], - eventQueue->events, eventQueue->head * sizeof(EventRec)); + if (eventQueue->events) { + memcpy(new_events, + &eventQueue->events[eventQueue->head], + first_hunk * sizeof(EventRec)); + memcpy(&new_events[first_hunk], + eventQueue->events, eventQueue->head * sizeof(EventRec)); + } /* Initialize the new portion */ for (i = eventQueue->nevents; i < new_nevents; i++) {