[FFmpeg-cvslog] rtpdec_asf: Check memory allocation and free memory on error
Vittorio Giovara
git at videolan.org
Mon Jun 8 23:12:21 CEST 2015
ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Wed Jun 3 14:16:50 2015 +0100| [4733a12dd17a91d606e0079ff9bb48b9f419cbef] | committer: Vittorio Giovara
rtpdec_asf: Check memory allocation and free memory on error
CC: libav-stable at libav.org
Bug-Id: CID 1257774
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4733a12dd17a91d606e0079ff9bb48b9f419cbef
---
libavformat/rtpdec_asf.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c
index 3ca3f71..597f29f 100644
--- a/libavformat/rtpdec_asf.c
+++ b/libavformat/rtpdec_asf.c
@@ -102,6 +102,9 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p)
AVDictionary *opts = NULL;
int len = strlen(p) * 6 / 8;
char *buf = av_mallocz(len);
+
+ if (!buf)
+ return AVERROR(ENOMEM);
av_base64_decode(buf, p, len);
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) {
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);
+ }
rt->asf_ctx->pb = &pb;
av_dict_set(&opts, "no_resync_search", "1", 0);
ret = avformat_open_input(&rt->asf_ctx, "", &ff_asf_demuxer, &opts);
av_dict_free(&opts);
- if (ret < 0)
+ if (ret < 0) {
+ av_free(buf);
return ret;
+ }
av_dict_copy(&s->metadata, rt->asf_ctx->metadata, 0);
rt->asf_pb_pos = avio_tell(&pb);
av_free(buf);
More information about the ffmpeg-cvslog
mailing list