[FFmpeg-cvslog] ape demuxer: fix segfault on memory allocation failure.
Laurent Aimar
git at videolan.org
Sun Dec 25 01:36:01 CET 2011
ffmpeg | branch: release/0.6 | Laurent Aimar <fenrir at videolan.org> | Sun Sep 11 19:17:40 2011 +0200| [44925239383d54af3d329fb5b12345f6209e8e62] | committer: Reinhard Tartler
ape demuxer: fix segfault on memory allocation failure.
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 273aab99bf7be2bcda95dd64101c2317ee0fcb99)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 4ee014309c377f7cfaa9578a393864ae500136f6)
Signed-off-by: Reinhard Tartler <siretart at tauware.de>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44925239383d54af3d329fb5b12345f6209e8e62
---
libavformat/ape.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/libavformat/ape.c b/libavformat/ape.c
index 0ebc307..56a9c78 100644
--- a/libavformat/ape.c
+++ b/libavformat/ape.c
@@ -263,6 +263,8 @@ static int ape_read_header(AVFormatContext * s, AVFormatParameters * ap)
if (ape->seektablelength > 0) {
ape->seektable = av_malloc(ape->seektablelength);
+ if (!ape->seektable)
+ return AVERROR(ENOMEM);
for (i = 0; i < ape->seektablelength / sizeof(uint32_t); i++)
ape->seektable[i] = get_le32(pb);
}
More information about the ffmpeg-cvslog
mailing list