Module: libav
Branch: release/0.5
Commit: fe4409a396d7f577fbcac6c2ff0df3c6eabc3727
Author: Luca Barbato <lu_z...@gentoo.org>
Committer: Reinhard Tartler <siret...@tauware.de>
Date: Sat Dec 22 17:58:24 2012 +0100
oggdec: check memory allocation
(cherry picked from commit ba064ebe48376e199f353ef0b335ed8a39c638c5)
Conflicts:
libavformat/oggdec.c
---
libavformat/oggdec.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index cf1df84..0bf7db0 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -159,8 +159,13 @@ ogg_new_stream (AVFormatContext * s, uint32_t serial)
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;
os->serial = serial;
@@ -279,6 +284,8 @@ 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;
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
