virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/xwma: fix memleak of dpds_table

Browse Source 
Fixes CID1087092
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-04-29 20:48:03 +02:00
parent cf4dbe9aff
commit 375a0c03a9
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libavformat/xwma.c
View File

@@ -130,8 +130,10 @@ static int xwma_read_header(AVFormatContext *s)
/* parse the remaining RIFF chunks */ /* parse the remaining RIFF chunks */
for (;;) { for (;;) {
if (pb->eof_reached) if (pb->eof_reached) {
return AVERROR_EOF; ret = AVERROR_EOF;
goto end;
}
/* read next chunk tag */ /* read next chunk tag */
tag = avio_rl32(pb); tag = avio_rl32(pb);
size = 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. */ /* Error out if there is more than one dpds chunk. */
if (dpds_table) { if (dpds_table) {
av_log(s, AV_LOG_ERROR, "two dpds chunks present\n"); av_log(s, AV_LOG_ERROR, "two dpds chunks present\n");
return AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto end;
} }
/* Compute the number of entries in the dpds chunk. */ /* Compute the number of entries in the dpds chunk. */
@@ -184,8 +187,10 @@ static int xwma_read_header(AVFormatContext *s)
} }
/* Determine overall data length */ /* Determine overall data length */
if (size < 0) if (size < 0) {
return AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto end;
}
if (!size) { if (!size) {
xwma->data_end = INT64_MAX; xwma->data_end = INT64_MAX;
} else } else
@@ -204,7 +209,8 @@ static int xwma_read_header(AVFormatContext *s)
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"Invalid bits_per_coded_sample %d for %d channels\n", "Invalid bits_per_coded_sample %d for %d channels\n",
st->codec->bits_per_coded_sample, st->codec->channels); st->codec->bits_per_coded_sample, st->codec->channels);
return AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto end;
} }
st->duration = total_decoded_bytes / bytes_per_sample; st->duration = total_decoded_bytes / bytes_per_sample;
@@ -239,9 +245,10 @@ static int xwma_read_header(AVFormatContext *s)
st->duration = (size<<3) * st->codec->sample_rate / st->codec->bit_rate; st->duration = (size<<3) * st->codec->sample_rate / st->codec->bit_rate;
} }
end:
av_free(dpds_table); av_free(dpds_table);
return 0; return ret;
} }
static int xwma_read_packet(AVFormatContext *s, AVPacket *pkt) static int xwma_read_packet(AVFormatContext *s, AVPacket *pkt)