From patchwork Sat Feb 17 03:20:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 7619 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp1432252jai; Fri, 16 Feb 2018 19:21:15 -0800 (PST) X-Google-Smtp-Source: AH8x226WBjB3FHFm3Hix6xYaqDWA3CseHnbhq6adv6lj24UESwVafK7a2R9dCzYQEMyWh+UnHl3t X-Received: by 10.28.92.70 with SMTP id q67mr6170085wmb.43.1518837675608; Fri, 16 Feb 2018 19:21:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518837675; cv=none; d=google.com; s=arc-20160816; b=cu1bgTWCS3Dop+2Jy2R9j2C6Tdi+REO0B5UXZd1IbZP7rdnePePa/40hhC4NYyaqrZ X3REW9x92oKaAaP/GBL4Qedy6R4jQEuQgrqFbd8k9iEbTD+gVvoKwLPvA6PT1yHAqNE3 qyrizwy07CD3Nl6/BGuTIhPq9Dk8B6P8FjsnJTLSslif2Wp7sMeOYVLxxlkNGnJLv9qD oWTGwAIhMdjqcYky2AvgNBev24yoxxk7SoYFBFlO4j8CIxGkzdW3UB/ty1EeiSASFBym lO3ij09Qf0QsEsx6jk5NUxTFSCuPlcg6ttVcGQHBzqUhgLsY17idICppZs9/MxrFU1Yw yILg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=LGUP+tRxhJTIH+BOe7epKBU9T98TSsoCIjPnyceOIHQ=; b=N9Gh6DQkVzPRZYh0r4dHTzjWJ4h4m4TyqG3SzmaOX9KjcSy+9O4tEIMZTUxGA8o5fa 3lMYc80hWxSS39O+Sb1NW82wIjE+phCEM7J7Kgz6ZLwNAKD9FCt20eKHDvwOugZibcfc x2HDA6WDmj34Ac7v70t3s8oiepiYyfiPS+jxtfmVIymMb6QNSqPrz8I9x6iht0VX9/Ch Ie1oAZzQlKow9lA83rCc2JIdjJvXZPwaiWKXgawWVAanNROn6ZRPdY+VTCfXR68zGU2I ApInkH5Bb36CzdSjr6Jrt+ntvVcknBYlv/c6Ly6v3VyufOo2OHZbOwSZw2itXRmU73+U 9tOA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m13si10940601wmh.234.2018.02.16.19.21.14; Fri, 16 Feb 2018 19:21:15 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8540068A1EC; Sat, 17 Feb 2018 05:21:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe02-3.mx.upcmail.net (vie01a-qmta-pe02-3.mx.upcmail.net [62.179.121.183]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C6E0468A188 for ; Sat, 17 Feb 2018 05:20:53 +0200 (EET) Received: from [172.31.218.36] (helo=vie01a-dmta-pe02-3.mx.upcmail.net) by vie01a-pqmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1emt3i-0002Rn-8C for ffmpeg-devel@ffmpeg.org; Sat, 17 Feb 2018 04:21:06 +0100 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1emt3c-00038C-VM for ffmpeg-devel@ffmpeg.org; Sat, 17 Feb 2018 04:21:00 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id BfLu1x0170S5wYM01fLv3a; Sat, 17 Feb 2018 04:20:55 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 17 Feb 2018 04:20:52 +0100 Message-Id: <20180217032054.21778-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.16.1 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/vp8: Check for bitstream end before vp7_fade_frame() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: Timeout Fixes: 5653/clusterfuzz-testcase-5497680018014208 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vp8.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 7f71a75e4b..62b9f8bc2d 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -656,6 +656,8 @@ static int vp7_decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_si s->fade_present = vp8_rac_get(c); } + if (c->end <= c->buffer && c->bits >= 0) + return AVERROR_INVALIDDATA; /* E. Fading information for previous frame */ if (s->fade_present && vp8_rac_get(c)) { if ((ret = vp7_fade_frame(s ,c)) < 0)