From 1a1be2a82fabbc8d831cafec32c1c521cbdaecc5 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 26 May 2013 18:44:52 +0200 Subject: [PATCH] eitd: addEvent - fix possible segfault if lastEvent==NULL --- src/eitd/sectionsd.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp index 78d90d089..46dbd5fb0 100644 --- a/src/eitd/sectionsd.cpp +++ b/src/eitd/sectionsd.cpp @@ -466,7 +466,7 @@ xprintf("addEvent: ch %012" PRIx64 " running %d (%s) got_CN %d\n", evt.get_chann #else time_t now = time(NULL); bool back = false; - if ((*lastEvent)->times.size() == 1) + if (*lastEvent!=NULL && (*lastEvent)->times.size() == 1) { if ((*lastEvent)->times.begin()->startzeit + (long)(*lastEvent)->times.begin()->dauer >= now - oldEventsAre) back = true; @@ -489,7 +489,8 @@ xprintf("addEvent: ch %012" PRIx64 " running %d (%s) got_CN %d\n", evt.get_chann } // else fprintf(stderr, ">"); unlockEvents(); - deleteEvent((*lastEvent)->uniqueKey()); + if(*lastEvent!=NULL) + deleteEvent((*lastEvent)->uniqueKey()); } else unlockEvents();