diff options
| author | wm4 <wm4@nowhere> | 2014-12-12 17:28:22 +0100 |
|---|---|---|
| committer | Alessandro Ghedini <alessandro@ghedini.me> | 2014-12-17 20:09:24 +0100 |
| commit | 34e504bf93996058425a2cdb884b7dd4576cda68 (patch) | |
| tree | e1cff050ed153613f42697a114fcd2e2576214a0 /demux | |
| parent | f0649ce841e717d907bfd28b90cf4c792aa5254f (diff) | |
| download | mpv-34e504bf93996058425a2cdb884b7dd4576cda68.tar.bz2 mpv-34e504bf93996058425a2cdb884b7dd4576cda68.tar.xz | |
Check some mallocs
Fixes #1337.
Diffstat (limited to 'demux')
| -rw-r--r-- | demux/demux_lavf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 62dcdf3655..e1800295cc 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -286,6 +286,8 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check) .buf_size = 0, .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE), }; + if (!avpd.buf) + return -1; bool final_probe = false; do { @@ -679,6 +681,8 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check) return -1; avfc = avformat_alloc_context(); + if (!avfc) + return -1; if (lavfdopts->cryptokey) parse_cryptokey(avfc, lavfdopts->cryptokey); |