Re: [FFmpeg-devel] [PATCH 1/2] avcodec/dstdec: Check read_table() for failure

2019-11-09 Thread Michael Niedermayer 
On Wed, Oct 16, 2019 at 01:05:44AM +0200, Michael Niedermayer wrote:
> Fixes: Timeout (too long -> 42sec)
> Fixes: 
> 18181/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DST_fuzzer-5736646250594304
> 
> Found-by: continuous fuzzing process 
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer 
> ---
>  libavcodec/dstdec.c | 8 ++--
>  1 file changed, 6 insertions(+), 2 deletions(-)

will apply patchset

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

Republics decline into democracies and democracies degenerate into
despotisms. -- 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".

[FFmpeg-devel] [PATCH 1/2] avcodec/dstdec: Check read_table() for failure

2019-10-15 Thread Michael Niedermayer 
Fixes: Timeout (too long -> 42sec)
Fixes: 
18181/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DST_fuzzer-5736646250594304

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

diff --git a/libavcodec/dstdec.c b/libavcodec/dstdec.c
index 48271b10f7..e0519d2a0b 100644
--- a/libavcodec/dstdec.c
+++ b/libavcodec/dstdec.c
@@ -302,11 +302,15 @@ static int decode_frame(AVCodecContext *avctx, void *data,
 
 /* Filter Coef Sets (10.12) */
 
-read_table(gb, &s->fsets, fsets_code_pred_coeff, 7, 9, 1, 0);
+ret = read_table(gb, &s->fsets, fsets_code_pred_coeff, 7, 9, 1, 0);
+if (ret < 0)
+return ret;
 
 /* Probability Tables (10.13) */
 
-read_table(gb, &s->probs, probs_code_pred_coeff, 6, 7, 0, 1);
+ret = read_table(gb, &s->probs, probs_code_pred_coeff, 6, 7, 0, 1);
+if (ret < 0)
+return ret;
 
 /* Arithmetic Coded Data (10.11) */
 
-- 
2.23.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".