aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-03-06 18:14:12 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2018-10-23 01:44:40 +0200
commitb8fd13befef430517bd262fc0cac1320128d0639 (patch)
treec09dc42d583f93651131123f7563c5b4c6cac030
parent29683c6ba1fce32de51c2600cdbd6733b29914d7 (diff)
downloadffmpeg-b8fd13befef430517bd262fc0cac1320128d0639.tar.gz
libavformat/oggparsevorbis: Fix memleak on multiple headers
Fixes: Chromium bug 800123 Reported-by: Matt Wolenetz <wolenetz@google.com> Reviewed-by: Matt Wolenetz <wolenetz@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 3934aa495d786845d9f541c84ee405c096938f76) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/oggparsevorbis.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index b96be98974..1c8acc3f94 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -228,6 +228,10 @@ static int fixup_vorbis_headers(AVFormatContext *as,
len = priv->len[0] + priv->len[1] + priv->len[2];
buf_len = len + len / 255 + 64;
+
+ if (*buf)
+ return AVERROR_INVALIDDATA;
+
ptr = *buf = av_realloc(NULL, buf_len);
if (!ptr)
return AVERROR(ENOMEM);