From: Jaroslav Kysela Date: Thu, 18 Dec 2014 11:26:38 +0000 (+0100) Subject: mkmux: fix crash when wrong localtime argument was used X-Git-Tag: v4.1~572 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=75084b79e65d694d2226f12a361197b115a8587c;p=thirdparty%2Ftvheadend.git mkmux: fix crash when wrong localtime argument was used --- diff --git a/src/muxer/tvh/mkmux.c b/src/muxer/tvh/mkmux.c index 80076e604..6bc62a088 100644 --- a/src/muxer/tvh/mkmux.c +++ b/src/muxer/tvh/mkmux.c @@ -678,7 +678,7 @@ _mk_build_metadata(const dvr_entry_t *de, const epg_broadcast_t *ebc, const epg_genre_t *eg = NULL; epg_genre_t eg0; struct tm tm; - localtime_r(de ? &de->de_start : &ebc->start, &tm); + time_t t; epg_episode_t *ee = NULL; channel_t *ch = NULL; lang_str_t *ls = NULL, *ls2 = NULL; @@ -690,6 +690,12 @@ _mk_build_metadata(const dvr_entry_t *de, const epg_broadcast_t *ebc, if (de) ch = de->de_channel; else if (ebc) ch = ebc->channel; + if (de || ebc) { + localtime_r(de ? &de->de_start : &ebc->start, &tm); + } else { + t = time(NULL); + localtime_r(&t, &tm); + } snprintf(datestr, sizeof(datestr), "%04d-%02d-%02d %02d:%02d:%02d", tm.tm_year + 1900,