mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-22 15:23:11 +00:00
avformat/tls: check for memory allocation failure when setting options
Signed-off-by: jackarain <jack.wgm@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
parent
05ea0457fc
commit
4e3916dbce
@ -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 < 0)
|
||||
return ret;
|
||||
|
||||
if (c->listen)
|
||||
snprintf(opts, sizeof(opts), "?listen=1");
|
||||
|
Loading…
Reference in New Issue
Block a user