[FFmpeg-cvslog] smacker demuxer: handle possible av_realloc() failure.
Kostya Shishkov
git at videolan.org
Thu Sep 22 01:17:28 CEST 2011
ffmpeg | branch: release/0.8 | Kostya Shishkov <kostya.shishkov at gmail.com> | Mon Sep 12 09:40:42 2011 +0200| [1125f26f83da490c9740cd84f52060a5ffb34e5b] | committer: Anton Khirnov
smacker demuxer: handle possible av_realloc() failure.
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 47a8589f7bc69d1a29da1dfdfbd0dfa78a9e31fd)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1125f26f83da490c9740cd84f52060a5ffb34e5b
---
libavformat/smacker.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/libavformat/smacker.c b/libavformat/smacker.c
index db9a02b..135b4ae 100644
--- a/libavformat/smacker.c
+++ b/libavformat/smacker.c
@@ -286,11 +286,16 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt)
for(i = 0; i < 7; i++) {
if(flags & 1) {
int size;
+ uint8_t *tmpbuf;
+
size = avio_rl32(s->pb) - 4;
frame_size -= size;
frame_size -= 4;
smk->curstream++;
- smk->bufs[smk->curstream] = av_realloc(smk->bufs[smk->curstream], size);
+ tmpbuf = av_realloc(smk->bufs[smk->curstream], size);
+ if (!tmpbuf)
+ return AVERROR(ENOMEM);
+ smk->bufs[smk->curstream] = tmpbuf;
smk->buf_sizes[smk->curstream] = size;
ret = avio_read(s->pb, smk->bufs[smk->curstream], size);
if(ret != size)
More information about the ffmpeg-cvslog
mailing list