diff options
| author | Max Horn <max@quendi.de> | 2011-04-12 17:44:20 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2011-04-14 13:56:09 +0200 |
| commit | ca402f32e392590a81a1381dab41c4f9c2c2f98a (patch) | |
| tree | 96fecc535e204b9406e2f888cb1f8ac3ce9b3047 /libavformat/xwma.c | |
| parent | ad4c50347a46a67807925245e730f738cb4d6562 (diff) | |
| download | ffmpeg-ca402f32e392590a81a1381dab41c4f9c2c2f98a.tar.gz | |
handle malloc failures in ff_get_wav_header
ff_get_wav_header is reading data from a WAVE file and then uses it
(without validation) to malloc a buffer. It then proceeded to read
data into the buffer, without verifying that the allocation succeeded.
To address this, change ff_get_wav_header to return an error if
allocation failed, and adapted all calling code to handle that error.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavformat/xwma.c')
| -rw-r--r-- | libavformat/xwma.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/xwma.c b/libavformat/xwma.c index 4238054476..ba2ee05395 100644 --- a/libavformat/xwma.c +++ b/libavformat/xwma.c @@ -40,6 +40,7 @@ static int xwma_probe(AVProbeData *p) static int xwma_read_header(AVFormatContext *s, AVFormatParameters *ap) { int64_t size, av_uninit(data_size); + int ret; uint32_t dpds_table_size = 0; uint32_t *dpds_table = 0; unsigned int tag; @@ -70,7 +71,9 @@ static int xwma_read_header(AVFormatContext *s, AVFormatParameters *ap) if (!st) return AVERROR(ENOMEM); - ff_get_wav_header(pb, st->codec, size); + ret = ff_get_wav_header(pb, st->codec, size); + if (ret < 0) + return ret; st->need_parsing = AVSTREAM_PARSE_NONE; /* All xWMA files I have seen contained WMAv2 data. If there are files |