diff mbox

[FFmpeg-devel] avcodec/dvbsubdec: Check for duplicate regions in dvbsub_parse_page_segment()

Message ID 20170822015641.28225-1-michael@niedermayer.cc
State Accepted
Commit 7c10068da10aa288195f5eb5d7e34eb2d8ff7447
Headers show

Commit Message

Michael Niedermayer Aug. 22, 2017, 1:56 a.m. UTC 
Fixes: OOM
Fixes: 3051/clusterfuzz-testcase-minimized-5745818336231424

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/dvbsubdec.c | 9 +++++++++
 1 file changed, 9 insertions(+)

Comments

Michael Niedermayer Aug. 25, 2017, 6:56 p.m. UTC | #1 
On Tue, Aug 22, 2017 at 03:56:41AM +0200, Michael Niedermayer wrote:
> Fixes: OOM
> Fixes: 3051/clusterfuzz-testcase-minimized-5745818336231424
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/dvbsubdec.c | 9 +++++++++
>  1 file changed, 9 insertions(+)

applied


[...]
diff mbox

Patch

diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c
index 98619f9631..b683109643 100644
--- a/libavcodec/dvbsubdec.c
+++ b/libavcodec/dvbsubdec.c
@@ -1302,6 +1302,15 @@  static int dvbsub_parse_page_segment(AVCodecContext *avctx,
         region_id = *buf++;
         buf += 1;
 
+        display = ctx->display_list;
+        while (display && display->region_id != region_id) {
+            display = display->next;
+        }
+        if (display) {
+            av_log(avctx, AV_LOG_ERROR, "duplicate region\n");
+            break;
+        }
+
         display = tmp_display_list;
         tmp_ptr = &tmp_display_list;