[FFmpeg-devel] [PATCH] libavforamt/tls: Memory allocation failure check

[FFmpeg-devel] [PATCH] libavforamt/tls: Memory allocation failure check

[jackarain]

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".

Re: [FFmpeg-devel] [PATCH] libavforamt/tls: Memory allocation failure check

[Marton Balint]

On Fri, 3 Mar 2023, jackarain wrote:

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

Thanks, will apply.

Regards,
Marton

>
> 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".
>
_______________________________________________
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".