From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id CE115455BE for ; Wed, 8 Mar 2023 22:45:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BC06A68BD8B; Thu, 9 Mar 2023 00:45:08 +0200 (EET) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C438568BD48 for ; Thu, 9 Mar 2023 00:45:06 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id E22FCE81AC for ; Wed, 8 Mar 2023 23:45:07 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XWjWVtQFAd5E for ; Wed, 8 Mar 2023 23:45:06 +0100 (CET) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id 1026AE812A for ; Wed, 8 Mar 2023 23:45:06 +0100 (CET) Date: Wed, 8 Mar 2023 23:45:06 +0100 (CET) From: Marton Balint To: FFmpeg development discussions and patches In-Reply-To: <20230303124759.1140538-1-jack.wgm@gmail.com> Message-ID: <6e8075f7-f939-ed8e-d387-e4d397f9d092@passwd.hu> References: <20230303124759.1140538-1-jack.wgm@gmail.com> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH] libavforamt/tls: Memory allocation failure check X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Fri, 3 Mar 2023, jackarain wrote: > Signed-off-by: jackarain > --- > 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".