diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2012-12-22 20:58:24 +0400 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2012-12-23 15:19:15 +0400 |
commit | ba064ebe48376e199f353ef0b335ed8a39c638c5 (patch) | |
tree | 75d4f0b6ad3a1e004c5fa5fcb6fa6f778eca560c /libavformat/oggdec.c | |
parent | f5f1cf52240759208b42477e2157a7b4409ade10 (diff) |
oggdec: check memory allocation
Diffstat (limited to 'libavformat/oggdec.c')
-rw-r--r-- | libavformat/oggdec.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index a1c126a3dc..07af5cf9d0 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -160,8 +160,13 @@ static int ogg_new_stream(AVFormatContext *s, uint32_t serial, int new_avstream) AVStream *st; struct ogg_stream *os; - ogg->streams = av_realloc(ogg->streams, - ogg->nstreams * sizeof(*ogg->streams)); + os = av_realloc(ogg->streams, ogg->nstreams * sizeof(*ogg->streams)); + + if (!os) + return AVERROR(ENOMEM); + + ogg->streams = os; + memset(ogg->streams + idx, 0, sizeof(*ogg->streams)); os = ogg->streams + idx; @@ -305,6 +310,8 @@ static int ogg_read_page(AVFormatContext *s, int *str) if (os->bufsize - os->bufpos < size) { uint8_t *nb = av_malloc((os->bufsize *= 2) + FF_INPUT_BUFFER_PADDING_SIZE); + if (!nb) + return AVERROR(ENOMEM); memcpy(nb, os->buf, os->bufpos); av_free(os->buf); os->buf = nb; |