From 6db559f0ae43b2e721e6fc9aa3dbbd1131a8a671 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 3 Oct 2014 21:28:56 +0200 Subject: [PATCH] mpegts mux: coverity fixes --- src/input/mpegts/mpegts_mux.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c index 2add0bfd..895a3889 100644 --- a/src/input/mpegts/mpegts_mux.c +++ b/src/input/mpegts/mpegts_mux.c @@ -261,7 +261,7 @@ mpegts_mux_class_scan_state_set ( void *o, const void *p ) } else if (state == MM_SCAN_STATE_IDLE) { /* No change */ - if (state == MM_SCAN_STATE_IDLE) + if (mm->mm_scan_state == MM_SCAN_STATE_IDLE) return 0; /* Update */ @@ -1009,8 +1009,11 @@ mpegts_mux_nice_name( mpegts_mux_t *mm, char *buf, size_t len ) { size_t len2; - if (len == 0 || buf == NULL) + if (len == 0 || buf == NULL || mm == NULL) { + if (buf && len > 0) + *buf = '\0'; return; + } if (mm->mm_display_name) mm->mm_display_name(mm, buf, len); else @@ -1023,7 +1026,7 @@ mpegts_mux_nice_name( mpegts_mux_t *mm, char *buf, size_t len ) strcpy(buf, " in "); buf += 4; len -= 4; - if (mm && mm->mm_network && mm->mm_network->mn_display_name) + if (mm->mm_network && mm->mm_network->mn_display_name) mm->mm_network->mn_display_name(mm->mm_network, buf, len); }