summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-13 16:42:00 +0200
committerAlessandro Ghedini <alessandro@ghedini.me>2014-10-15 15:13:47 +0200
commita6eb0714fa25f083959491abf631549deb51047a (patch)
tree5611069ef1f197e2715bc8dfcdfc3e1f881f98ad
parent7d9f8f75eaf23f210260564da2dcaab86b7579ad (diff)
downloadmpv-a6eb0714fa25f083959491abf631549deb51047a.tar.bz2
mpv-a6eb0714fa25f083959491abf631549deb51047a.tar.xz
demux_mkv: fix undefined behavior
With some files, the extradata variable can remain uninitialized, but will be used for memory access. CC: @mpv-player/stable (with high priority)
-rw-r--r--demux/demux_mkv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 8c00a8fe8f..01939274da 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -1149,7 +1149,7 @@ static const videocodec_info_t vinfo[] = {
static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track)
{
- unsigned char *extradata;
+ unsigned char *extradata = NULL;
unsigned int extradata_size = 0;
bool raw = false;
struct sh_stream *sh = new_sh_stream(demuxer, STREAM_VIDEO);