[FFmpeg-devel] [PATCH] avcodec/ccaption_dec: Add a blank like at the end to avoid rollup reading from outside

Paul B Mahol onemda at gmail.com
Sat Apr 20 20:34:06 EEST 2019


On 4/20/19, Michael Niedermayer <michael at niedermayer.cc> wrote:
> Fixes: index 20 out of bounds for type 'const char *[4][128]'
> Fixes:
> 14367/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CCAPTION_fuzzer-5718819672162304
>
> 14367/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CCAPTION_fuzzer-5718819672162304
> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
>  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.
> --
> 2.21.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".

Probably OK


More information about the ffmpeg-devel mailing list