From 167ffeccf96914ac473d35e253253b51f2adeb2c Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 15 Feb 2018 19:45:32 +0100 Subject: [PATCH] dvr: fix NULL pointer dereference in dvr_entry_get_epg_running, fixes #4943, fixes #4967 --- src/dvr/dvr_db.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c index 8272bab60..983070928 100644 --- a/src/dvr/dvr_db.c +++ b/src/dvr/dvr_db.c @@ -445,11 +445,15 @@ dvr_entry_get_rerecord_errors( dvr_entry_t *de ) int dvr_entry_get_epg_running( dvr_entry_t *de ) { + channel_t *ch; + if (de->de_dvb_eid == 0) return 0; - if (de->de_channel->ch_epg_running < 0) + if ((ch = de->de_channel) == NULL) + return 0; + if (ch->ch_epg_running < 0) return de->de_config->dvr_running; - return de->de_channel->ch_epg_running > 0; + return ch->ch_epg_running > 0; } /* -- 2.47.3