From 521fbcbb84720e2c70d305f04a3440c837e58eef Mon Sep 17 00:00:00 2001 From: Jasmin Jessich Date: Thu, 18 May 2017 22:59:42 +0200 Subject: Fire assert in CreateEpgInfo if chan is NULL --- epg_events.cpp | 3 +++ epg_events.h | 1 + 2 files changed, 4 insertions(+) diff --git a/epg_events.cpp b/epg_events.cpp index 41b9d08..fabf033 100644 --- a/epg_events.cpp +++ b/epg_events.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include #include "tools.h" @@ -303,6 +304,8 @@ namespace vdrlive EpgInfoPtr CreateEpgInfo(cChannel const *chan, cEvent const *event, char const *idOverride) { + assert(chan); + if (event) { string domId(idOverride ? idOverride : EncodeDomId(chan->GetChannelID(), event->EventID())); return EpgInfoPtr(new EpgEvent(domId, event, chan->Name())); diff --git a/epg_events.h b/epg_events.h index 98951ab..0729ad2 100644 --- a/epg_events.h +++ b/epg_events.h @@ -30,6 +30,7 @@ namespace vdrlive /** * Allocate and initalize an epgEvent instance with the * passed channel and event information. + * Never call this function with a NULL chan pointer */ EpgInfoPtr CreateEpgInfo(cChannel const *chan, cEvent const *event, char const *idOverride = 0); -- cgit v1.2.3