summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-13 16:42:00 +0200
committerwm4 <wm4@nowhere>2014-10-13 16:42:00 +0200
commit057384baa6c624f072cb856cb599f03e043fa2c5 (patch)
treee4e52109fa86a34da38f37bfa4b40f0b4427bd4f
parentceba1d446a586c314bfc01ffd65ca7931dadc133 (diff)
downloadmpv-057384baa6c624f072cb856cb599f03e043fa2c5.tar.bz2
mpv-057384baa6c624f072cb856cb599f03e043fa2c5.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);