[FFmpeg-cvslog] avformat/oggdec: Reallocate buffer before writing into it

Michael Niedermayer git at videolan.org
Sat May 2 00:52:09 EEST 2020


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri May  1 14:34:18 2020 +0200| [fb9e9da0b360d6eb3ff960e276d9c225d83d4bb1] | committer: Michael Niedermayer

avformat/oggdec: Reallocate buffer before writing into it

Fixes: out of array write
Fixes: Regression since f619e1ec66b89215582eff4404b681b760540b4f

Reviewed-by: Lynne <dev at lynne.ee>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb9e9da0b360d6eb3ff960e276d9c225d83d4bb1
---

 libavformat/oggdec.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index a9034ea61c..7dd48af66c 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -441,6 +441,12 @@ static int ogg_read_page(AVFormatContext *s, int *sid, int probing)
 
         os = ogg->streams + idx;
 
+        ret = buf_realloc(os, size);
+        if (ret < 0) {
+            av_free(readout_buf);
+            return ret;
+        }
+
         memcpy(os->buf + os->bufpos, readout_buf, size);
         av_free(readout_buf);
     }



More information about the ffmpeg-cvslog mailing list