diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2011-09-12 09:40:42 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-09-26 19:26:32 +0200 |
| commit | 0b9b3570a3e3f3eff088ee061dbab165ff3eff2f (patch) | |
| tree | 78a8ef0635c14e2401d8fb6ee66604547e49f6c8 | |
| parent | 9b30b7b9bfc83df9ba7c9a39fd0dcd74dfc063f3 (diff) | |
| download | ffmpeg-0b9b3570a3e3f3eff088ee061dbab165ff3eff2f.tar.gz | |
smacker demuxer: handle possible av_realloc() failure.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 47a8589f7bc69d1a29da1dfdfbd0dfa78a9e31fd)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavformat/smacker.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/smacker.c b/libavformat/smacker.c index db9a02bb6c..135b4ae708 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) |