From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 3 Oct 2016 17:37:21 +0000 (+0200)
Subject: muxer: fix NULL pointer dereference (m_add_marker), fixes #4007
X-Git-Tag: v4.2.1~292
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c40170510abb7fffdcf1258037c90cf31d8ace8a;p=thirdparty%2Ftvheadend.git

muxer: fix NULL pointer dereference (m_add_marker), fixes #4007
---

diff --git a/src/muxer.h b/src/muxer.h
index 28a623730..d0bedff9f 100644
--- a/src/muxer.h
+++ b/src/muxer.h
@@ -122,7 +122,7 @@ static inline int muxer_reconfigure (muxer_t *m, const struct streaming_start *s
   { if(m && ss) return m->m_reconfigure(m, ss); return -1; }
 
 static inline int muxer_add_marker (muxer_t *m)
-  { if (m) return m->m_add_marker(m); return -1; }
+  { if (m && m->m_add_marker) return m->m_add_marker(m); return -1; }
 
 static inline int muxer_close (muxer_t *m)
   { if (m) return m->m_close(m); return -1; }