diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2011-09-12 09:40:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-21 19:34:25 +0200 |
| commit | b1ceca016a498f2629f5cf1faa3d7981ab825f5a (patch) | |
| tree | 5651097a49fcbc5ed82a4a3cec2fd6a591a57bce | |
| parent | 85b1e265c9dafaf60e120db73ce795eea24e1fad (diff) | |
| download | ffmpeg-b1ceca016a498f2629f5cf1faa3d7981ab825f5a.tar.gz | |
smacker demuxer: handle possible av_realloc() failure.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavformat/smacker.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/smacker.c b/libavformat/smacker.c index c22f6daa73..ad6f265c83 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -286,15 +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); - if (!smk->bufs[smk->curstream]) { - smk->buf_sizes[smk->curstream] = 0; + 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) |