[FFmpeg-cvslog] avcodec/ccaption_dec: Add a blank like at the end to avoid rollup reading from outside
Michael Niedermayer
git at videolan.org
Mon Apr 22 01:51:02 EEST 2019
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Apr 20 18:11:42 2019 +0200| [f17e8e90bb1fe5e4db18cc6dde9522417108c7bd] | committer: Michael Niedermayer
avcodec/ccaption_dec: Add a blank like at the end to avoid rollup reading from outside
Fixes: index 20 out of bounds for type 'const char *[4][128]'
Fixes: 14367/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CCAPTION_fuzzer-5718819672162304
Reviewed-by: Paul B Mahol <onemda at gmail.com>
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f17e8e90bb1fe5e4db18cc6dde9522417108c7bd
---
libavcodec/ccaption_dec.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/ccaption_dec.c b/libavcodec/ccaption_dec.c
index 09ceb1b3bf..bf3563a0bc 100644
--- a/libavcodec/ccaption_dec.c
+++ b/libavcodec/ccaption_dec.c
@@ -212,10 +212,10 @@ static const unsigned char pac2_attribs[32][3] = // Color, font, ident
struct Screen {
/* +1 is used to compensate null character of string */
- uint8_t characters[SCREEN_ROWS][SCREEN_COLUMNS+1];
- uint8_t charsets[SCREEN_ROWS][SCREEN_COLUMNS+1];
- uint8_t colors[SCREEN_ROWS][SCREEN_COLUMNS+1];
- uint8_t fonts[SCREEN_ROWS][SCREEN_COLUMNS+1];
+ uint8_t characters[SCREEN_ROWS+1][SCREEN_COLUMNS+1];
+ uint8_t charsets[SCREEN_ROWS+1][SCREEN_COLUMNS+1];
+ uint8_t colors[SCREEN_ROWS+1][SCREEN_COLUMNS+1];
+ uint8_t fonts[SCREEN_ROWS+1][SCREEN_COLUMNS+1];
/*
* Bitmask of used rows; if a bit is not set, the
* corresponding row is not used.
More information about the ffmpeg-cvslog
mailing list