summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-04-12 17:40:45 +0200
committerwm4 <wm4@nowhere>2013-04-20 23:28:22 +0200
commit6ef855069f057322a2fb19a51024a750e6a04f0f (patch)
tree05195c5521ce2cb2b1720f10522d05f2a565a90d /demux
parent9f21c81633504696fc68a8ca94465460c54c5243 (diff)
downloadmpv-6ef855069f057322a2fb19a51024a750e6a04f0f.tar.bz2
mpv-6ef855069f057322a2fb19a51024a750e6a04f0f.tar.xz
demux_mkv: check block malloc() result
Diffstat (limited to 'demux')
-rw-r--r--demux/demux_mkv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index a96e69d811..387779ddc8 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -2091,6 +2091,8 @@ static int read_block(demuxer_t *demuxer, struct block_info *block)
if (length > 500000000)
goto exit;
block->alloc = malloc(length + AV_LZO_INPUT_PADDING);
+ if (!block->alloc)
+ goto exit;
block->data = (bstr){block->alloc, length};
demuxer->filepos = stream_tell(s);
if (stream_read(s, block->data.start, block->data.len) != block->data.len)