From c571424c7f6276a6374e1784ce2a33d4b6a4292d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?=
<alexandra.khirnova@gmail.com>
Date: Mon, 13 Jul 2015 12:02:03 +0200
Subject: [PATCH] asfdec: prevent memory leaks found with Coverity Scan
Signed-off-by: Anton Khirnov <anton@khirnov.net>
---
libavformat/asfdec.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index eaa69fdc0d8..7af372805ae 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -281,8 +281,10 @@ static int asf_read_value(AVFormatContext *s, uint8_t *name, uint16_t name_len,
av_log(s, AV_LOG_WARNING, "av_dict_set failed.\n");
} else {
char buf[256];
- if (val_len > sizeof(buf))
- return AVERROR_INVALIDDATA;
+ if (val_len > sizeof(buf)) {
+ ret = AVERROR_INVALIDDATA;
+ goto failed;
+ }
if ((ret = avio_read(pb, value, val_len)) < 0)
goto failed;
if (ret < 2 * val_len)
@@ -404,8 +406,10 @@ static int asf_read_picture(AVFormatContext *s, int len)
}
asf->asf_st[asf->nb_streams] = av_mallocz(sizeof(*asf_st));
asf_st = asf->asf_st[asf->nb_streams];
- if (!asf_st)
- return AVERROR(ENOMEM);
+ if (!asf_st) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
st->disposition |= AV_DISPOSITION_ATTACHED_PIC;
st->codec->codec_type = asf_st->type = AVMEDIA_TYPE_VIDEO;
--
GitLab