Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: jackarain <jack.wgm@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Cc: jackarain <jack.wgm@gmail.com>
Subject: [FFmpeg-devel] [PATCH] libavforamt/tls: Memory allocation failure check
Date: Fri,  3 Mar 2023 20:47:59 +0800
Message-ID: <20230303124759.1140538-1-jack.wgm@gmail.com> (raw)

Signed-off-by: jackarain <jack.wgm@gmail.com>
---
 libavformat/tls.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/libavformat/tls.c b/libavformat/tls.c
index e42d399862..b9d3426331 100644
--- a/libavformat/tls.c
+++ b/libavformat/tls.c
@@ -30,15 +30,18 @@
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
 
-static void set_options(TLSShared *c, const char *uri)
+static int set_options(TLSShared *c, const char *uri)
 {
     char buf[1024];
     const char *p = strchr(uri, '?');
     if (!p)
-        return;
+        return 0;
 
-    if (!c->ca_file && av_find_info_tag(buf, sizeof(buf), "cafile", p))
+    if (!c->ca_file && av_find_info_tag(buf, sizeof(buf), "cafile", p)) {
         c->ca_file = av_strdup(buf);
+        if (!c->ca_file)
+            return AVERROR(ENOMEM);
+    }
 
     if (!c->verify && av_find_info_tag(buf, sizeof(buf), "verify", p)) {
         char *endptr = NULL;
@@ -47,11 +50,19 @@ static void set_options(TLSShared *c, const char *uri)
             c->verify = 1;
     }
 
-    if (!c->cert_file && av_find_info_tag(buf, sizeof(buf), "cert", p))
+    if (!c->cert_file && av_find_info_tag(buf, sizeof(buf), "cert", p)) {
         c->cert_file = av_strdup(buf);
+        if (!c->cert_file)
+            return AVERROR(ENOMEM);
+    }
 
-    if (!c->key_file && av_find_info_tag(buf, sizeof(buf), "key", p))
+    if (!c->key_file && av_find_info_tag(buf, sizeof(buf), "key", p)) {
         c->key_file = av_strdup(buf);
+        if (!c->key_file)
+            return AVERROR(ENOMEM);
+    }
+
+    return 0;
 }
 
 int ff_tls_open_underlying(TLSShared *c, URLContext *parent, const char *uri, AVDictionary **options)
@@ -63,8 +74,11 @@ int ff_tls_open_underlying(TLSShared *c, URLContext *parent, const char *uri, AV
     const char *proxy_path;
     char *env_http_proxy, *env_no_proxy;
     int use_proxy;
+    int ret;
 
-    set_options(c, uri);
+    ret = set_options(c, uri);
+    if (ret)
+        return ret;
 
     if (c->listen)
         snprintf(opts, sizeof(opts), "?listen=1");
-- 
2.39.2

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

             reply	other threads:[~2023-03-03 12:48 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-03 12:47 jackarain [this message]
2023-03-08 22:45 ` Marton Balint

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230303124759.1140538-1-jack.wgm@gmail.com \
    --to=jack.wgm@gmail.com \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git