[FFmpeg-devel] [PATCH 2/6] avcodec/loco: Check for end of input in pixel decode

[Paul B Mahol]

lgtm

On Sat, Aug 3, 2019 at 1:51 AM Michael Niedermayer <michael at niedermayer.cc>
wrote:

> Fixes: Timeout (100sec -> 5sec)
> Fixes:
> 15509/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LOCO_fuzzer-5724297261219840
>
> Found-by: continuous fuzzing process
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by
> <https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by>:
> Michael Niedermayer <michael at niedermayer.cc>
> ---
>  libavcodec/loco.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/libavcodec/loco.c b/libavcodec/loco.c
> index e8c62b8178..5fb414b411 100644
> --- a/libavcodec/loco.c
> +++ b/libavcodec/loco.c
> @@ -88,6 +88,8 @@ static inline int loco_get_rice(RICEContext *r)
>          loco_update_rice_param(r, 0);
>          return 0;
>      }
> +    if (get_bits_left(&r->gb) < 1)
> +        return INT_MIN;
>      v = get_ur_golomb_jpegls(&r->gb, loco_get_rice_param(r), INT_MAX, 0);
>      loco_update_rice_param(r, (v + 1) >> 1);
>      if (!v) {
> @@ -163,6 +165,8 @@ static int loco_decode_plane(LOCOContext *l, uint8_t
> *data, int width, int heigh
>          /* restore all other pixels */
>          for (i = 1; i < width; i++) {
>              val = loco_get_rice(&rc);
> +            if (val == INT_MIN)
> +                return -1;
>              data[i] = loco_predict(&data[i], stride) + val;
>          }
>          data += stride;
> --
> 2.22.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".