[vlc-commits] mkv: Fix NULL deref
Hugo Beauzée-Luyssen
git at videolan.org
Wed Feb 21 11:06:20 CET 2018
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed Feb 21 10:37:11 2018 +0100| [6f3fcc970640122790d1b04fec3a721802777c37] | committer: Hugo Beauzée-Luyssen
mkv: Fix NULL deref
Fix #19785
(cherry picked from commit 5bc9920b1017ce6df513505e23954a42d18475aa)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=6f3fcc970640122790d1b04fec3a721802777c37
---
modules/demux/mkv/matroska_segment_parse.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp
index 0b82866bb7..0ffc98decb 100644
--- a/modules/demux/mkv/matroska_segment_parse.cpp
+++ b/modules/demux/mkv/matroska_segment_parse.cpp
@@ -1523,7 +1523,8 @@ bool matroska_segment_c::TrackInit( mkv_track_t * p_tk )
}
S_CASE("V_MPEG2") {
vars.p_fmt->i_codec = VLC_CODEC_MPGV;
- if (strstr(vars.obj->psz_muxing_application,"libmakemkv"))
+ if (vars.obj->psz_muxing_application != NULL &&
+ strstr(vars.obj->psz_muxing_application,"libmakemkv"))
vars.p_fmt->b_packetized = false;
fill_extra_data( vars.p_tk, 0 );
}
More information about the vlc-commits
mailing list