eitd: addEvent - fix possible segfault if lastEvent==NULL

This commit is contained in:
Jacek Jendrzej
2013-05-26 18:44:52 +02:00
parent eeecbb3bcd
commit 1a1be2a82f

View File

@@ -466,7 +466,7 @@ xprintf("addEvent: ch %012" PRIx64 " running %d (%s) got_CN %d\n", evt.get_chann
#else #else
time_t now = time(NULL); time_t now = time(NULL);
bool back = false; 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) if ((*lastEvent)->times.begin()->startzeit + (long)(*lastEvent)->times.begin()->dauer >= now - oldEventsAre)
back = true; back = true;
@@ -489,7 +489,8 @@ xprintf("addEvent: ch %012" PRIx64 " running %d (%s) got_CN %d\n", evt.get_chann
} }
// else fprintf(stderr, ">"); // else fprintf(stderr, ">");
unlockEvents(); unlockEvents();
deleteEvent((*lastEvent)->uniqueKey()); if(*lastEvent!=NULL)
deleteEvent((*lastEvent)->uniqueKey());
} }
else else
unlockEvents(); unlockEvents();