stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

mpegts mux: coverity fixes

Browse source
This commit is contained in:
Jaroslav Kysela 2014-10-03 21:28:56 +02:00
parent f78bd7adcb
commit 6db559f0ae
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/input/mpegts/mpegts_mux.c
View file

@ -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);
}