From 81688e68f93f3142e2093f1a3d226edaeb179992 Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Wed, 4 Feb 2015 14:21:00 +0000
Subject: [PATCH] avconv: Check rc_override memory allocation
CC: libav-stable@libav.org
Bug-Id: CID 1265719
---
avconv_opt.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/avconv_opt.c b/avconv_opt.c
index 74e235b6d5b..16254299e22 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -1136,6 +1136,10 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
video_enc->rc_override =
av_realloc(video_enc->rc_override,
sizeof(RcOverride) * (i + 1));
+ if (!video_enc->rc_override) {
+ av_log(NULL, AV_LOG_FATAL, "Could not (re)allocate memory for rc_override.\n");
+ exit_program(1);
+ }
video_enc->rc_override[i].start_frame = start;
video_enc->rc_override[i].end_frame = end;
if (q > 0) {
--
GitLab