RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-21 15:00:27 +00:00
Code Issues Projects Releases Wiki Activity

rtpdec_asf: Check memory allocation and free memory on error

Browse Source 
CC: libav-stable@libav.org
Bug-Id: CID 1257774
This commit is contained in:
Vittorio Giovara 2015-06-03 14:16:50 +01:00
parent 6308cd4868
commit 4733a12dd1
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/rtpdec_asf.c
View File

@ -102,6 +102,9 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p)
AVDictionary *opts = NULL; AVDictionary *opts = NULL;
int len = strlen(p) * 6 / 8; int len = strlen(p) * 6 / 8;
char *buf = av_mallocz(len); char *buf = av_mallocz(len);
if (!buf)
return AVERROR(ENOMEM);
av_base64_decode(buf, p, len); av_base64_decode(buf, p, len);
if (rtp_asf_fix_header(buf, len) < 0) if (rtp_asf_fix_header(buf, len) < 0)
@ -111,14 +114,19 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p)
if (rt->asf_ctx) { if (rt->asf_ctx) {
avformat_close_input(&rt->asf_ctx); avformat_close_input(&rt->asf_ctx);
} }
if (!(rt->asf_ctx = avformat_alloc_context())) rt->asf_ctx = avformat_alloc_context();
if (!rt->asf_ctx) {
av_free(buf);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
rt->asf_ctx->pb = &pb; rt->asf_ctx->pb = &pb;
av_dict_set(&opts, "no_resync_search", "1", 0); av_dict_set(&opts, "no_resync_search", "1", 0);
ret = avformat_open_input(&rt->asf_ctx, "", &ff_asf_demuxer, &opts); ret = avformat_open_input(&rt->asf_ctx, "", &ff_asf_demuxer, &opts);
av_dict_free(&opts); av_dict_free(&opts);
if (ret < 0) if (ret < 0) {
av_free(buf);
return ret; return ret;
}
av_dict_copy(&s->metadata, rt->asf_ctx->metadata, 0); av_dict_copy(&s->metadata, rt->asf_ctx->metadata, 0);
rt->asf_pb_pos = avio_tell(&pb); rt->asf_pb_pos = avio_tell(&pb);
av_free(buf); av_free(buf);