Skip to content

V
vlc
Commit 1defacfa authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

ts: avoid undefined memcmp(NULL, NULL, 0)

parent 75b85591
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
modules/demux/mpeg/ts.c
View file @ 1defacfa
...@@ -5348,8 +5348,10 @@ static void PMTCallBack( void *data, dvbpsi_pmt_t *p_dvbpsipmt ) ...@@ -5348,8 +5348,10 @@ static void PMTCallBack( void *data, dvbpsi_pmt_t *p_dvbpsipmt )
/* p_pes points to a tmp pes */ /* p_pes points to a tmp pes */
if( !es_format_IsSimilar( &pespid->u.p_pes->es.fmt, &p_pes->es.fmt ) || if( !es_format_IsSimilar( &pespid->u.p_pes->es.fmt, &p_pes->es.fmt ) ||
pespid->u.p_pes->es.fmt.i_extra != p_pes->es.fmt.i_extra || pespid->u.p_pes->es.fmt.i_extra != p_pes->es.fmt.i_extra ||
memcmp( pespid->u.p_pes->es.fmt.p_extra, p_pes->es.fmt.p_extra, ( pespid->u.p_pes->es.fmt.i_extra > 0 &&
p_pes->es.fmt.i_extra ) || memcmp( pespid->u.p_pes->es.fmt.p_extra,
p_pes->es.fmt.p_extra,
p_pes->es.fmt.i_extra ) ) ||
pespid->u.p_pes->extra_es.i_size != p_pes->extra_es.i_size || pespid->u.p_pes->extra_es.i_size != p_pes->extra_es.i_size ||
!!pespid->u.p_pes->es.fmt.psz_language != !!p_pes->es.fmt.psz_language || !!pespid->u.p_pes->es.fmt.psz_language != !!p_pes->es.fmt.psz_language ||
( pespid->u.p_pes->es.fmt.psz_language && p_pes->es.fmt.psz_language && ( pespid->u.p_pes->es.fmt.psz_language && p_pes->es.fmt.psz_language &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment