From patchwork Mon Aug 12 00:17:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 14430 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id BEC65449F01 for ; Mon, 12 Aug 2019 03:19:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9CB3A68ABB3; Mon, 12 Aug 2019 03:19:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe08-2.mx.upcmail.net (vie01a-dmta-pe08-2.mx.upcmail.net [84.116.36.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3390668A74E for ; Mon, 12 Aug 2019 03:19:07 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1hwy3G-0007TT-4S for ffmpeg-devel@ffmpeg.org; Mon, 12 Aug 2019 02:19:06 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id wy2Hhgfdmwlyswy2Hh29fI; Mon, 12 Aug 2019 02:18:05 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=E5OzWpVl c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=l5iRD6tvSnKDezShl9gA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=QOGEsqRv6VhmHaoFNykA:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 12 Aug 2019 02:17:17 +0200 Message-Id: <20190812001719.9247-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190812001719.9247-1-michael@niedermayer.cc> References: <20190812001719.9247-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfGXOnVqF0qvFMZGKXJUcfxxqwKCBs1Ox5HFhTAZlRJPvG5Rmo/b2npotT1ifTR6wePSQpaAMxMMYWDBkfKxV3DBU2S4e6sNF1LOn+qzcGrFqS+gCeKhB 0qQ+3m2USlxRBdDZqYMpL8yAk9aeGMocWdNa+EOFZcEKbBWIkZ+/oZZW Subject: [FFmpeg-devel] [PATCH 4/6] [RFC] avcodec/motionpixels: Check for end of input in mp_decode_frame_helper() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Improves: Timeout (75sec -> 50sec) Improves: 16053/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MOTIONPIXELS_fuzzer-5647069169057792 Together with the planed reduction in the threshold this would bring this to 20sec and fix the Timeout Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/motionpixels.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c index 8750a4fa16..ecf32b6144 100644 --- a/libavcodec/motionpixels.c +++ b/libavcodec/motionpixels.c @@ -253,7 +253,7 @@ static void mp_decode_line(MotionPixelsContext *mp, GetBitContext *gb, int y) } } -static void mp_decode_frame_helper(MotionPixelsContext *mp, GetBitContext *gb) +static int mp_decode_frame_helper(MotionPixelsContext *mp, GetBitContext *gb) { YuvPixel p; int y, y0; @@ -265,6 +265,8 @@ static void mp_decode_frame_helper(MotionPixelsContext *mp, GetBitContext *gb) memset(mp->gradient_scale, 1, sizeof(mp->gradient_scale)); p = mp_get_yuv_from_rgb(mp, 0, y); } else { + if (mp->codes_count > 1 && get_bits_left(gb) < 1) + return AVERROR_INVALIDDATA; p.y += mp_gradient(mp, 0, mp_get_vlc(mp, gb)); p.y = av_clip_uintp2(p.y, 5); if ((y & 3) == 0) { @@ -280,6 +282,8 @@ static void mp_decode_frame_helper(MotionPixelsContext *mp, GetBitContext *gb) for (y0 = 0; y0 < 2; ++y0) for (y = y0; y < mp->avctx->height; y += 2) mp_decode_line(mp, gb, y); + + return 0; } static int mp_decode_frame(AVCodecContext *avctx,