diff mbox

[FFmpeg-devel,V1,2/3] fftools/ffmpeg_opt: add error handle if av_asprintf return null

Message ID 1570842880-22864-2-git-send-email-mypopydev@gmail.com
State Accepted
Commit ed3c317deac933cfbc3c8f38a8930069b0847323
Headers show

Commit Message

Jun Zhao Oct. 12, 2019, 1:14 a.m. UTC 
From: Jun Zhao <barryjzhao@tencent.com>

add error handle if av_asprintf return null.

Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
---
 fftools/ffmpeg_opt.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

Comments

Michael Niedermayer Oct. 13, 2019, 9:13 p.m. UTC | #1 
On Sat, Oct 12, 2019 at 09:14:39AM +0800, Jun Zhao wrote:
> From: Jun Zhao <barryjzhao@tencent.com>
> 
> add error handle if av_asprintf return null.
> 
> Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
> ---
>  fftools/ffmpeg_opt.c |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)

LGTM

thx

[...]
diff mbox

Patch

diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index fa22eb3..af9a9a6 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -3008,6 +3008,8 @@  static int opt_old2new(void *optctx, const char *opt, const char *arg)
 {
     OptionsContext *o = optctx;
     char *s = av_asprintf("%s:%c", opt + 1, *opt);
+    if (!s)
+        return AVERROR(ENOMEM);
     int ret = parse_option(o, s, arg, options);
     av_free(s);
     return ret;
@@ -3039,6 +3041,8 @@  static int opt_qscale(void *optctx, const char *opt, const char *arg)
         return parse_option(o, "q:v", arg, options);
     }
     s = av_asprintf("q%s", opt + 6);
+    if (!s)
+        return AVERROR(ENOMEM);
     ret = parse_option(o, s, arg, options);
     av_free(s);
     return ret;
@@ -3084,6 +3088,8 @@  static int opt_timecode(void *optctx, const char *opt, const char *arg)
 {
     OptionsContext *o = optctx;
     char *tcr = av_asprintf("timecode=%s", arg);
+    if (!tcr)
+        return AVERROR(ENOMEM);
     int ret = parse_option(o, "metadata:g", tcr, options);
     if (ret >= 0)
         ret = av_dict_set(&o->g->codec_opts, "gop_timecode", arg, 0);