[FFmpeg-cvslog] xwma: Do not leak on failure path
ffmpeg | branch: release/2.4 | Luca Barbato lu_z...@gentoo.org | Mon Nov 17
00:22:21 2014 +0100| [32701252af65014bb68194bb61d67ec1882ae75d] | committer:
Luca Barbato
xwma: Do not leak on failure path
CC: libav-sta...@libav.org
Bug-Id: CID 1087092
(cherry picked from commit fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6)
Signed-off-by: Luca Barbato lu_z...@gentoo.org
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=32701252af65014bb68194bb61d67ec1882ae75d
---
libavformat/xwma.c | 23 +++
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/libavformat/xwma.c b/libavformat/xwma.c
index 45d74de..af916ad 100644
--- a/libavformat/xwma.c
+++ b/libavformat/xwma.c
@@ -44,7 +44,7 @@ static int xwma_probe(AVProbeData *p)
static int xwma_read_header(AVFormatContext *s)
{
int64_t size;
-int ret;
+int ret = 0;
uint32_t dpds_table_size = 0;
uint32_t *dpds_table = 0;
unsigned int tag;
@@ -130,8 +130,10 @@ static int xwma_read_header(AVFormatContext *s)
/* parse the remaining RIFF chunks */
for (;;) {
-if (pb-eof_reached)
-return -1;
+if (pb-eof_reached) {
+ret = AVERROR_INVALIDDATA;
+goto fail;
+}
/* read next chunk tag */
tag = avio_rl32(pb);
size = avio_rl32(pb);
@@ -152,7 +154,8 @@ static int xwma_read_header(AVFormatContext *s)
/* Error out if there is more than one dpds chunk. */
if (dpds_table) {
av_log(s, AV_LOG_ERROR, two dpds chunks present\n);
-return -1;
+ret = AVERROR_INVALIDDATA;
+goto fail;
}
/* Compute the number of entries in the dpds chunk. */
@@ -184,8 +187,10 @@ static int xwma_read_header(AVFormatContext *s)
}
/* Determine overall data length */
-if (size 0)
-return -1;
+if (size 0) {
+ret = AVERROR_INVALIDDATA;
+goto fail;
+}
if (!size) {
xwma-data_end = INT64_MAX;
} else
@@ -204,7 +209,8 @@ static int xwma_read_header(AVFormatContext *s)
av_log(s, AV_LOG_ERROR,
Invalid bits_per_coded_sample %d for %d channels\n,
st-codec-bits_per_coded_sample, st-codec-channels);
-return AVERROR_INVALIDDATA;
+ret = AVERROR_INVALIDDATA;
+goto fail;
}
st-duration = total_decoded_bytes / bytes_per_sample;
@@ -239,9 +245,10 @@ static int xwma_read_header(AVFormatContext *s)
st-duration = (size3) * st-codec-sample_rate /
st-codec-bit_rate;
}
+fail:
av_free(dpds_table);
-return 0;
+return ret;
}
static int xwma_read_packet(AVFormatContext *s, AVPacket *pkt)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] xwma: Do not leak on failure path
ffmpeg | branch: master | Luca Barbato lu_z...@gentoo.org | Mon Nov 17
00:22:21 2014 +0100| [fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6] | committer:
Vittorio Giovara
xwma: Do not leak on failure path
CC: libav-sta...@libav.org
Bug-Id: CID 1087092
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6
---
libavformat/xwma.c | 23 +++
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/libavformat/xwma.c b/libavformat/xwma.c
index 45d74de..af916ad 100644
--- a/libavformat/xwma.c
+++ b/libavformat/xwma.c
@@ -44,7 +44,7 @@ static int xwma_probe(AVProbeData *p)
static int xwma_read_header(AVFormatContext *s)
{
int64_t size;
-int ret;
+int ret = 0;
uint32_t dpds_table_size = 0;
uint32_t *dpds_table = 0;
unsigned int tag;
@@ -130,8 +130,10 @@ static int xwma_read_header(AVFormatContext *s)
/* parse the remaining RIFF chunks */
for (;;) {
-if (pb-eof_reached)
-return -1;
+if (pb-eof_reached) {
+ret = AVERROR_INVALIDDATA;
+goto fail;
+}
/* read next chunk tag */
tag = avio_rl32(pb);
size = avio_rl32(pb);
@@ -152,7 +154,8 @@ static int xwma_read_header(AVFormatContext *s)
/* Error out if there is more than one dpds chunk. */
if (dpds_table) {
av_log(s, AV_LOG_ERROR, two dpds chunks present\n);
-return -1;
+ret = AVERROR_INVALIDDATA;
+goto fail;
}
/* Compute the number of entries in the dpds chunk. */
@@ -184,8 +187,10 @@ static int xwma_read_header(AVFormatContext *s)
}
/* Determine overall data length */
-if (size 0)
-return -1;
+if (size 0) {
+ret = AVERROR_INVALIDDATA;
+goto fail;
+}
if (!size) {
xwma-data_end = INT64_MAX;
} else
@@ -204,7 +209,8 @@ static int xwma_read_header(AVFormatContext *s)
av_log(s, AV_LOG_ERROR,
Invalid bits_per_coded_sample %d for %d channels\n,
st-codec-bits_per_coded_sample, st-codec-channels);
-return AVERROR_INVALIDDATA;
+ret = AVERROR_INVALIDDATA;
+goto fail;
}
st-duration = total_decoded_bytes / bytes_per_sample;
@@ -239,9 +245,10 @@ static int xwma_read_header(AVFormatContext *s)
st-duration = (size3) * st-codec-sample_rate /
st-codec-bit_rate;
}
+fail:
av_free(dpds_table);
-return 0;
+return ret;
}
static int xwma_read_packet(AVFormatContext *s, AVPacket *pkt)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
