smacker demuxer: handle possible av_realloc() failure.
Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit47a8589f7b
) Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit0b9b3570a3
) Conflicts: libavformat/smacker.c Signed-off-by: Reinhard Tartler <siretart@tauware.de>
This commit is contained in:

committed by
Reinhard Tartler

parent
5394cdf775
commit
f79f3a946f
@@ -289,10 +289,15 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt)
|
|||||||
if(flags & 1) {
|
if(flags & 1) {
|
||||||
int size;
|
int size;
|
||||||
size = get_le32(s->pb) - 4;
|
size = get_le32(s->pb) - 4;
|
||||||
|
uint8_t *tmpbuf;
|
||||||
|
|
||||||
frame_size -= size;
|
frame_size -= size;
|
||||||
frame_size -= 4;
|
frame_size -= 4;
|
||||||
smk->curstream++;
|
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;
|
smk->buf_sizes[smk->curstream] = size;
|
||||||
ret = get_buffer(s->pb, smk->bufs[smk->curstream], size);
|
ret = get_buffer(s->pb, smk->bufs[smk->curstream], size);
|
||||||
if(ret != size)
|
if(ret != size)
|
||||||
|
Reference in New Issue
Block a user