avconv: Check rc_override memory allocation

Message ID 20150217180454.88D535DC7C@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau Feb. 17, 2015, 6:04 p.m.
Module: libav
Branch: master
Commit: 81688e68f93f3142e2093f1a3d226edaeb179992

Author:    Vittorio Giovara <vittorio.giovara@gmail.com>
Committer: Vittorio Giovara <vittorio.giovara@gmail.com>
Date:      Wed Feb  4 14:21:00 2015 +0000

avconv: Check rc_override memory allocation

CC: libav-stable@libav.org
Bug-Id: CID 1265719

---

 avconv_opt.c |    4 ++++
 1 file changed, 4 insertions(+)

Patch

diff --git a/avconv_opt.c b/avconv_opt.c
index 74e235b..1625429 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) {