Re: [FFmpeg-devel] [PATCH 4/8] avcodec/loco: Check left column value

2019-08-14 Thread Michael Niedermayer
On Wed, Aug 14, 2019 at 06:00:01PM +0200, Paul B Mahol wrote:
> LGTM

will apply

thx

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The worst form of inequality is to try to make unequal things equal.
-- Aristotle


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 4/8] avcodec/loco: Check left column value

2019-08-14 Thread Paul B Mahol
LGTM

On Mon, Aug 12, 2019 at 9:20 PM Michael Niedermayer 
wrote:

> Fixes: Timeout (42sec -> 379 ms)
> Fixes:
> 16323/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LOCO_fuzzer-5679178099195904
>
> Found-by: continuous fuzzing process
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by
> :
> Michael Niedermayer 
> ---
>  libavcodec/loco.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/libavcodec/loco.c b/libavcodec/loco.c
> index 5fb414b411..d8bf68a100 100644
> --- a/libavcodec/loco.c
> +++ b/libavcodec/loco.c
> @@ -161,6 +161,8 @@ static int loco_decode_plane(LOCOContext *l, uint8_t
> *data, int width, int heigh
>  for (j = 1; j < height; j++) {
>  /* restore left column */
>  val = loco_get_rice(&rc);
> +if (val == INT_MIN)
> +   return AVERROR_INVALIDDATA;
>  data[0] = data[-stride] + val;
>  /* restore all other pixels */
>  for (i = 1; i < width; i++) {
> --
> 2.22.0
>
> ___
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 4/8] avcodec/loco: Check left column value

2019-08-12 Thread Michael Niedermayer
Fixes: Timeout (42sec -> 379 ms)
Fixes: 
16323/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LOCO_fuzzer-5679178099195904

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
---
 libavcodec/loco.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/loco.c b/libavcodec/loco.c
index 5fb414b411..d8bf68a100 100644
--- a/libavcodec/loco.c
+++ b/libavcodec/loco.c
@@ -161,6 +161,8 @@ static int loco_decode_plane(LOCOContext *l, uint8_t *data, 
int width, int heigh
 for (j = 1; j < height; j++) {
 /* restore left column */
 val = loco_get_rice(&rc);
+if (val == INT_MIN)
+   return AVERROR_INVALIDDATA;
 data[0] = data[-stride] + val;
 /* restore all other pixels */
 for (i = 1; i < width; i++) {
-- 
2.22.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".