virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

avformat/libsrt: check av_strdup() return value and fix memleak

Browse Source 
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
This commit is contained in:
Steven Liu 2019-10-10 10:43:58 +08:00
parent 17d96c15d2
commit 1f7b527194
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/libsrt.c
View File

@ -478,6 +478,7 @@ static int libsrt_open(URLContext *h, const char *uri, int flags)
SRTContext *s = h->priv_data; SRTContext *s = h->priv_data;
const char * p; const char * p;
char buf[256]; char buf[256];
int ret = 0;
if (srt_startup() < 0) { if (srt_startup() < 0) {
return AVERROR_UNKNOWN; return AVERROR_UNKNOWN;
@ -564,10 +565,18 @@ static int libsrt_open(URLContext *h, const char *uri, int flags)
if (av_find_info_tag(buf, sizeof(buf), "streamid", p)) { if (av_find_info_tag(buf, sizeof(buf), "streamid", p)) {
av_freep(&s->streamid); av_freep(&s->streamid);
s->streamid = av_strdup(buf); s->streamid = av_strdup(buf);
if (!s->streamid) {
ret = AVERROR(ENOMEM);
goto err;
}
} }
if (av_find_info_tag(buf, sizeof(buf), "smoother", p)) { if (av_find_info_tag(buf, sizeof(buf), "smoother", p)) {
av_freep(&s->smoother); av_freep(&s->smoother);
s->smoother = av_strdup(buf); s->smoother = av_strdup(buf);
if(!s->smoother) {
ret = AVERROR(ENOMEM);
goto err;
}
} }
if (av_find_info_tag(buf, sizeof(buf), "messageapi", p)) { if (av_find_info_tag(buf, sizeof(buf), "messageapi", p)) {
s->messageapi = strtol(buf, NULL, 10); s->messageapi = strtol(buf, NULL, 10);
@ -578,11 +587,16 @@ static int libsrt_open(URLContext *h, const char *uri, int flags)
} else if (!strcmp(buf, "file")) { } else if (!strcmp(buf, "file")) {
s->transtype = SRTT_FILE; s->transtype = SRTT_FILE;
} else { } else {
return AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto err;
} }
} }
} }
return libsrt_setup(h, uri, flags); return libsrt_setup(h, uri, flags);
err:
av_freep(&s->smoother);
av_freep(&s->streamid);
return ret;
} }
static int libsrt_read(URLContext *h, uint8_t *buf, int size) static int libsrt_read(URLContext *h, uint8_t *buf, int size)