summaryrefslogtreecommitdiff
path: root/avconv_opt.c
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-02-04 14:21:00 +0000
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-02-17 11:27:41 -0500
commit81688e68f93f3142e2093f1a3d226edaeb179992 (patch)
treedd7d0fea4c33c59874d1fe06f417894930d523c7 /avconv_opt.c
parent9d3b752fceb0f2a42cac7c2a1109b0629823c99f (diff)
avconv: Check rc_override memory allocation
CC: libav-stable@libav.org Bug-Id: CID 1265719
Diffstat (limited to 'avconv_opt.c')
-rw-r--r--avconv_opt.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/avconv_opt.c b/avconv_opt.c
index 74e235b6d5..16254299e2 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) {