From patchwork Sat Feb 17 21:25:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 7623 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp2192882jai; Sat, 17 Feb 2018 13:25:28 -0800 (PST) X-Google-Smtp-Source: AH8x226MCicHQjzXFLgLcWV4ybmSYcy9BBeuSCsF8mhzAhHmRLY9E9/Pj7kG2YPh5iEwcfhPzvMw X-Received: by 10.223.154.173 with SMTP id a42mr9666326wrc.240.1518902728183; Sat, 17 Feb 2018 13:25:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518902728; cv=none; d=google.com; s=arc-20160816; b=sOtykDI4h2CajseiddjLluS1xzi4MqIQlErG6uk7v1Cqw2i9zw+u9WP00WPXe6Gbgp WuInMwWfh2GGNvwPdf5oubQfAZlXEUAU4IrXRerS3GiYioIsNqEFvbjETNgHy+dpVXCq WA5Ol4ziEvgJ5IpmgBxHlxmo0qWF5oDGhX1HV3K/uTNKtTclRzJhk0DbsX0Goovqnt6R Bb0trNC9CbMpe8OWJQu02AWt6tZ3OoTivtGVk/UabpgLG+Xs9mwkkPPAyCWngcllIliv GBYVnXsTNSqUkJjGfW1YKvQQBrD0n506UVx0/GMtFYCont/N7XrfxUujjBJZpT5/ZhUI 8kgg== 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=VPU0waRVvQG7T+zG+5X3/LFo4mH4UY5onxDh6g+jMdc=; b=gF3u4p0l3P+2gexd0gEyQoHl62Q+eQKcrLCjlXToHRcDeLxEbml/BDEafR895IBUfk ncS9CncDB/p7yHD/KBjzNMzk5QFQ8HOHPoOX0HVa3yBi/FFa/UpbhI18If9GcJ58QL1Q F0Y1yMKjs+7D6r0G4D79rf7ILEE6qtWpj9KrPw8Ds1/trbMjACxNTT3GNABlkdkPA7T2 lRwji94P9IhBD/xhRI/CSUHxa3IaPTv6NzfcUGNiosn9i19xrDv7/pB8RUFUSyYGwHxi LXD+d36ygHa4/TEhElx7jZAP69cWmwupeocqVEHu3HVQXtECdauOzeMDVy63ITF+MPhM ImmA== 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 b4si6878555wrf.69.2018.02.17.13.25.27; Sat, 17 Feb 2018 13:25:28 -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 DB06B689AB1; Sat, 17 Feb 2018 23:25:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-1.mx.upcmail.net (vie01a-dmta-pe02-1.mx.upcmail.net [62.179.121.157]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E4A86898DA for ; Sat, 17 Feb 2018 23:25:20 +0200 (EET) 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 1en9yw-0007Hn-Ou for ffmpeg-devel@ffmpeg.org; Sat, 17 Feb 2018 22:25:18 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id BxRC1x00v0S5wYM01xRDA0; Sat, 17 Feb 2018 22:25:13 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 17 Feb 2018 22:25:10 +0100 Message-Id: <20180217212512.18487-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.16.1 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/dxtory: Remove code that corrupts dimensions 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: 5796/clusterfuzz-testcase-minimized-5206729085157376 Does someone have a valid sample that triggers this path ? Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/dxtory.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c index e736cec8db..285ca38efb 100644 --- a/libavcodec/dxtory.c +++ b/libavcodec/dxtory.c @@ -305,11 +305,7 @@ static int dxtory_decode_v2(AVCodecContext *avctx, AVFrame *pic, } if (avctx->height - line) { - av_log(avctx, AV_LOG_VERBOSE, - "Not enough slice data available, " - "cropping the frame by %d pixels\n", - avctx->height - line); - avctx->height = line; + avpriv_request_sample(avctx, "Not enough slice data available"); } return 0;