From patchwork Thu Jun 1 00:26:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41934 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp10979pzb; Wed, 31 May 2023 17:27:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4dNeD1Q0lxrEYmrEvCX/LsfhM3RZrrivxIm8Ag+hOgH2+RoQ15xzZU1F2uUe+HB68uVuwY X-Received: by 2002:a17:907:3f90:b0:96f:7070:3419 with SMTP id hr16-20020a1709073f9000b0096f70703419mr7313827ejc.51.1685579253948; Wed, 31 May 2023 17:27:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685579253; cv=none; d=google.com; s=arc-20160816; b=IXSasfGyVvFMCVyeDbwiRWe2kEbyuhgt/oVCrBKSFy1JV+UU9XRK76losoOyXkBfW2 X8i9JmFZxzDnhpqLtSoeLqWE5VrBceEBJ97VmdetFaov10mUkZr7sDDhZ+R/drynYgT9 JpEvf3IAri9q0JlZiyM+o29N63wpeepp0/vgGbuQVd1pV6H7prAQ0q2CoNs/DiuDQz+A A7gO8iglcyPS+FVqgDILfGqqlKhmvkISIS3zqsWGZsbok3KrLcI5aKmz0iBT+yqe2MDj U0DokvotH3mMFkFKpceFV/+r4rPz03++ajq2Uj4riK/XytyllafL85fME552gBqDuOUl sj1g== 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; bh=9BPTCRabz5ldJ7OTx2FuJeXiMjNJidgIwVJBE92cr4c=; b=RF4tuhwFLUPddCpryJlix8n4D9hJzNI2l2Cee2LYx2aYsyHsIllKXvFrd1b9zPf8pJ Wb8AGTNy4lNdO+q7K01mOH+d4j+2ltEEoXUzE7bOLDSS1TZonwyTrVv/UZgN3/+At701 JXRKd0PgAmlxPNaF6odiAbxILPXu1ijvnnWN3FQBnv79tiPeFSQN9HAYWGCDUMCR2V+D aYOb4c79FxSBB/LuQXjKZ1ZmS1YgvakujXmVA8/BATaA517PlAQpzFXGulcxBvqZQdzq 2zEBqc+L3E9ZGyj612M+iWUglO/8FCZd84o6FJnnExdnguQyV2CPs3D+IHn9Vgni/sYC 0wkg== 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 w19-20020a1709067c9300b00961aff9c3bcsi1262818ejo.680.2023.05.31.17.27.11; Wed, 31 May 2023 17:27:33 -0700 (PDT) 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 DF25868BF98; Thu, 1 Jun 2023 03:27:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7120B68BF98 for ; Thu, 1 Jun 2023 03:27:01 +0300 (EEST) X-GND-Sasl: michael@niedermayer.cc Received: by mail.gandi.net (Postfix) with ESMTPSA id C43A520002 for ; Thu, 1 Jun 2023 00:27:00 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 1 Jun 2023 02:26:58 +0200 Message-Id: <20230601002659.9506-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/lcldec: Make PNG filter addressing match the code afterwards X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 5csY9sXILukI Also update check accordingly Fixes: tickets/10237/mszh_306_306_yuv422_nocompress.avi Fixes: tickets/10237/mszh_306_306_yuv411_nocompress.avi Signed-off-by: Michael Niedermayer --- libavcodec/lcldec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index ed78d9d570..1c93378c4c 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -231,16 +231,19 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, break; case COMP_MSZH_NOCOMP: { int bppx2; + int widtha = width; switch (c->imgtype) { case IMGTYPE_YUV111: case IMGTYPE_RGB24: bppx2 = 6; break; case IMGTYPE_YUV422: + widtha &= ~3; case IMGTYPE_YUV211: bppx2 = 4; break; case IMGTYPE_YUV411: + widtha &= ~3; case IMGTYPE_YUV420: bppx2 = 3; break; @@ -248,7 +251,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, bppx2 = 0; // will error out below break; } - if (len < ((width * height * bppx2) >> 1)) + if (len < ((widtha * height * bppx2) >> 1)) return AVERROR_INVALIDDATA; break; } @@ -314,8 +317,8 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, } break; case IMGTYPE_YUV422: + pixel_ptr = 0; for (row = 0; row < height; row++) { - pixel_ptr = row * width * 2; yq = uq = vq =0; for (col = 0; col < width/4; col++) { encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; @@ -331,8 +334,8 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, } break; case IMGTYPE_YUV411: + pixel_ptr = 0; for (row = 0; row < height; row++) { - pixel_ptr = row * width / 2 * 3; yq = uq = vq =0; for (col = 0; col < width/4; col++) { encoded[pixel_ptr] = yq -= encoded[pixel_ptr]; From patchwork Thu Jun 1 00:26:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41935 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp10982pzb; Wed, 31 May 2023 17:27:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4R2UOUm2sgHtXP9C1Tlt8JLIbszcOapZZc2BtDn42ZwAenGQhdYhEjJjXxgF/3a2zhl/tj X-Received: by 2002:a17:907:868d:b0:957:17c5:8705 with SMTP id qa13-20020a170907868d00b0095717c58705mr7175775ejc.51.1685579254563; Wed, 31 May 2023 17:27:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685579254; cv=none; d=google.com; s=arc-20160816; b=cxWGahZNb2CdvU220NOIauC1PX387T4TSJ8g4tNDn4Lv9WFZESVzpLh+L2zm7xHrGQ GtLWDJw2+HDEB3qa3yNt5nLpt7Bozyxk1ueDUWO1miOhI/9VM3S2RbinmR9gLvyED8As 6VIrtVgKzxH/fPgkBGhREWAGGebuBwoz2+IvwESwhvVE/mo0CJjWEnSSqVIiVuJcQyWJ H4UT35u4lBWxW9iIuMKQzIwGoun9qde93yuM68QM3S9wTbvvVGo2+x8dHXWMNqCqhJCl psLfqHiUm22SdyPxTGFUMeNGBIb9t7LqveCif41Z7oghnIKSzX9osvNBx/I2zBR+1IUn QtCA== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=tt4Kdw8WO+tZMOppwLb1lE1aoZkKwusgdovqgfZvm1M=; b=KG+4w5PgK3t8NCMFK+DSlJxPnrMvH4SWM3Qv2n1B+6oO2HHuBjZbgDQSGmIvDWVJ51 lqucqIUpTLJDghPlqX6ZZ2uQRZVWdBaQ3N4J+23/usrNa2syVtjVRwxhL5skpduOTOhD m8CkT6vjdx4xm4sXI3IbCgiWtnQw8b8V3ZBSyCY8c/HCGzYV+ZqKckINcxSprZKWjMWl VQc2T5tKI1/2EpdjxUoL8Nfe6JUTN0Ji+4I4hBViKBfPmbePAIUQRVtT/CpCdORLHnIo /ww8oPaO9fbdAzoRLf69Z8n1BKXIEvB8Z5h9Va9vFmIAQ2g5aOYAlBNL5DLHzYopF/n0 9vzA== 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 kz6-20020a17090777c600b0096996a5ea2asi12037094ejc.397.2023.05.31.17.27.20; Wed, 31 May 2023 17:27:34 -0700 (PDT) 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 D5B2D68C23C; Thu, 1 Jun 2023 03:27:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5737D68C175 for ; Thu, 1 Jun 2023 03:27:02 +0300 (EEST) X-GND-Sasl: michael@niedermayer.cc Received: by mail.gandi.net (Postfix) with ESMTPSA id B6553240003 for ; Thu, 1 Jun 2023 00:27:01 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 1 Jun 2023 02:26:59 +0200 Message-Id: <20230601002659.9506-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230601002659.9506-1-michael@niedermayer.cc> References: <20230601002659.9506-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/2] tools/target_dec_fuzzer: Adjust threshold for QPEG X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: i9qjaFtnYV14 Fixes: Timeout Fixes: 59332/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QPEG_fuzzer-6292824736530432 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index d8e93f3a21..1dbdad50b6 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -268,6 +268,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_OPUS: maxsamples /= 16384; break; case AV_CODEC_ID_PNG: maxpixels /= 128; break; case AV_CODEC_ID_APNG: maxpixels /= 128; break; + case AV_CODEC_ID_QPEG: maxpixels /= 128; break; case AV_CODEC_ID_QTRLE: maxpixels /= 16; break; case AV_CODEC_ID_PAF_VIDEO: maxpixels /= 16; break; case AV_CODEC_ID_PRORES: maxpixels /= 256; break;