diff mbox series

[FFmpeg-devel,2/2] avdevice/avfoundation: check strdup

Message ID tencent_D723B8ED16654D1DA04E4DB44FC4D52DA707@qq.com
State Accepted
Commit 079de4991229fe18aeafee4ef2d420ce62861b81
Headers show
Series [FFmpeg-devel,1/2] avdevice/avfoundation: fix memleak | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished
andriy/make_aarch64_jetson success Make finished
andriy/make_fate_aarch64_jetson success Make fate finished
andriy/make_armv7_RPi4 success Make finished
andriy/make_fate_armv7_RPi4 success Make fate finished

Commit Message

Zhao Zhili Feb. 4, 2022, 4:19 p.m. UTC 
---
 libavdevice/avfoundation.m | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Comments

Thilo Borgmann Feb. 22, 2022, 12:12 p.m. UTC | #1 
Am 04.02.22 um 17:19 schrieb Zhao Zhili:
> ---
>   libavdevice/avfoundation.m | 12 ++++++++++--
>   1 file changed, 10 insertions(+), 2 deletions(-)

Pushed, thanks!

-Thilo
diff mbox series

Patch

diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m
index 2078c4879c..8f5e2bd120 100644
--- a/libavdevice/avfoundation.m
+++ b/libavdevice/avfoundation.m
@@ -310,18 +310,21 @@  static void destroy_context(AVFContext* ctx)
     }
 }
 
-static void parse_device_name(AVFormatContext *s)
+static int parse_device_name(AVFormatContext *s)
 {
     AVFContext *ctx = (AVFContext*)s->priv_data;
     ctx->url = av_strdup(s->url);
     char *save;
 
+    if (!ctx->url)
+        return AVERROR(ENOMEM);
     if (ctx->url[0] != ':') {
         ctx->video_filename = av_strtok(ctx->url,  ":", &save);
         ctx->audio_filename = av_strtok(NULL, ":", &save);
     } else {
         ctx->audio_filename = av_strtok(ctx->url,  ":", &save);
     }
+    return 0;
 }
 
 /**
@@ -760,6 +763,7 @@  static int get_audio_config(AVFormatContext *s)
 
 static int avf_read_header(AVFormatContext *s)
 {
+    int ret = 0;
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     uint32_t num_screens    = 0;
     AVFContext *ctx         = (AVFContext*)s->priv_data;
@@ -812,7 +816,9 @@  static int avf_read_header(AVFormatContext *s)
     }
 
     // parse input filename for video and audio device
-    parse_device_name(s);
+    ret = parse_device_name(s);
+    if (ret)
+        goto fail;
 
     // check for device index given in filename
     if (ctx->video_device_index == -1 && ctx->video_filename) {
@@ -1002,6 +1008,8 @@  static int avf_read_header(AVFormatContext *s)
 fail:
     [pool release];
     destroy_context(ctx);
+    if (ret)
+        return ret;
     return AVERROR(EIO);
 }