Skip to content

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

mkv: avoid potential NULL memory comparison 

memcmp(NULL, b, 0) and memcpy(a, NULL, 0) are undefined in ISO C.
parent a1c81a10
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
modules/demux/mkv/virtual_segment.cpp
View file @ 9fea6f98
......@@ -663,7 +663,7 @@ void virtual_segment_c::ChangeSegment( matroska_segment_c * p_old, matroska_segm
( p_nfmt->i_priority == p_ofmt->i_priority ) &&
( p_nfmt->i_bitrate == p_ofmt->i_bitrate ) &&
( p_nfmt->i_extra == p_ofmt->i_extra ) &&
( (!p_nfmt->p_extra && !p_ofmt->p_extra) ||
( p_nfmt->i_extra == 0 ||
!memcmp( p_nfmt->p_extra, p_ofmt->p_extra, p_nfmt->i_extra ) ) &&
!strcasecmp( p_nfmt->psz_language, p_ofmt->psz_language ) &&
( ( p_nfmt->i_cat == AUDIO_ES &&
......
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