From 2b337d67a472cf88c9b1a4ee7da07820b8e4a5c9 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 12 Dec 2014 17:28:22 +0100
Subject: Check some mallocs

Fixes #1337.
---
 demux/demux_lavf.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'demux')

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);
-- 
cgit v1.2.3