summaryrefslogtreecommitdiff
path: root/avplay.c
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-02-04 14:21:01 +0000
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-02-17 11:27:41 -0500
commit733f4b05f0e120ddd0393b23f2b6d9106cf922e4 (patch)
tree1d70523d90669810fc58b1552744220ad121a517 /avplay.c
parent266f241193b2fa8c99bb8b1f007c66bedd3b7d97 (diff)
avplay: Check format allocation inside decode_thread()
CC: libav-stable@libav.org Bug-Id: CID 1265718
Diffstat (limited to 'avplay.c')
-rw-r--r--avplay.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/avplay.c b/avplay.c
index 5c6fcfdb0b..b1ce057d46 100644
--- a/avplay.c
+++ b/avplay.c
@@ -2257,6 +2257,11 @@ static int decode_thread(void *arg)
global_video_state = is;
ic = avformat_alloc_context();
+ if (!ic) {
+ av_log(NULL, AV_LOG_FATAL, "Could not allocate context.\n");
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
ic->interrupt_callback.callback = decode_interrupt_cb;
err = avformat_open_input(&ic, is->filename, is->iformat, &format_opts);
if (err < 0) {