highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef'

Browse Source 
* commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef':
  rtpdec_asf: Check memory allocation and free memory on error

Conflicts:
	libavformat/rtpdec_asf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-08 23:05:01 +02:00
parent 3d6635749a 4733a12dd1
commit d5a645625d
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/rtpdec_asf.c
View File

@@ -108,6 +108,8 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p)
char *buf = av_mallocz(len); char *buf = av_mallocz(len);
AVInputFormat *iformat; AVInputFormat *iformat;
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)
@@ -117,10 +119,15 @@ 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 (!(iformat = av_find_input_format("asf"))) if (!(iformat = av_find_input_format("asf")))
return AVERROR_DEMUXER_NOT_FOUND; return AVERROR_DEMUXER_NOT_FOUND;
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);
@@ -131,8 +138,10 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p)
ret = avformat_open_input(&rt->asf_ctx, "", iformat, &opts); ret = avformat_open_input(&rt->asf_ctx, "", iformat, &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);