From patchwork Fri Dec 15 01:48:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 45153 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp5364684pzf; Thu, 14 Dec 2023 17:48:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IH7v8hZaqw5hO92ss/1fKKVPnOylt1NmTvO5DrrBetOLBAKOopRWvVplyAAGiR/dyG78NM7 X-Received: by 2002:a50:a6d7:0:b0:54d:d048:df9d with SMTP id f23-20020a50a6d7000000b0054dd048df9dmr5522965edc.44.1702604921060; Thu, 14 Dec 2023 17:48:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702604921; cv=none; d=google.com; s=arc-20160816; b=SZ66U77bCq5I7CY/9Beh55xcWnjvhY0MkvRGY/vqKJ0shWlky3x4+1z29c3j5huCQX qjd//RQDKDHlC9AOlnZXxw8JH+iT5LS5/Urr2Vr76WvRD7KAVZKQHMcngd7+K9VsPyha 3nPA9eWLZVFi+4UnVJoZOubLQ/H6pEe33/lUwN7SQczDms4vO6HQEOKvlay0SqlaTAsi 3N+1L81nAPatqFyibt+kibR3LYkpkgZICPMJ06jDqffwXOhcAsEtSiMBj63Vo/Ygs0aF f6Tuzx2aYONYvnrxlDVFfabTg/q8OR/+PN9Ah7v+x0+h4V9q405hIHndH9i+bGYQh9cr yetg== 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:dkim-signature :delivered-to; bh=oPimvI1XPXpRBoDWQCvWTqb0cfHcDCkiDu9+7F+6efk=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=T41A+HvcZZw1Z/flFK1xeQXT2sPXsPDZmKpYxxEPGLmKU/drHEMQ4EtO3pEsT8nnPN ImH6lXygmez+QbgCcLm9IfQmyzA4qHaK0wTP8LPnsv9EBRv0yHy5Fa1YL7Y8neIjF72O eDylDCMVeO/ho11oY0WYpj+aiKzf1k3iVXkR0vhAThWKpmEbNbOi1WR6yCRfYnnhWTQ/ ZXrFyDt463t5hjkGsdOUuRqzLMYg80ovSc8tPKQXszP7mVLnBmkD5bEZClbVnso8HM6C skRa70PXqIwmiAjNj+QNxlgSM2jIfAwUnwD0GtnfWAlBg+hiAyKz2F/UiyrDA2kt8fCh kXyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=WfsGQ2QG; 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 t2-20020a50c242000000b00551510d3387si3364192edf.622.2023.12.14.17.48.40; Thu, 14 Dec 2023 17:48:41 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=WfsGQ2QG; 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 CFF6E68D15C; Fri, 15 Dec 2023 03:48:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2D5668D028 for ; Fri, 15 Dec 2023 03:48:29 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id D7BEE1C0002 for ; Fri, 15 Dec 2023 01:48:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1702604909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=qEmFqShYSbFcVT1pekyHo6wzbKAFngdOxhUSB/L841M=; b=WfsGQ2QGwMYzynI9q9DgBC5spgn2Y0z/gboPp97jJC3Gfq163mIeAcZyj3NgTPQrcDmQ5N TGZ+khotaIMmj0iLkTZldmvw9zNOzrHx5I/GV4T/cL18K76zS2/iHn+hUDOeoZcNwdmg+O vyKvVEWBWtfc9TxMERr13RS0OUoDCPEFek5YjbmY0F6KOx3213wRynt77WfLAwTzJzg9Sx T03inareOxiZQaMfL75REfhqjCQRFo+U8sdKsItUx1MuCEYDDn0nV0V7Hyy3NpORE0kpYE l/SZTRtkfcURynSYNyBMf3ogroGxzd9NahY4cybh4HmyrHyL4X904CKpPn8uhw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 15 Dec 2023 02:48:26 +0100 Message-Id: <20231215014828.8115-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/3] 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: wtnJx3/WvmUj Fixes: 63712/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QPEG_fuzzer-456353017272729 Fixes: Timeout 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 62085cf0803..e59db6697df 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -273,6 +273,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { 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; + case AV_CODEC_ID_QPEG: maxpixels /= 256; break; case AV_CODEC_ID_RKA: maxsamples /= 65536; break; case AV_CODEC_ID_RSCC: maxpixels /= 256; break; case AV_CODEC_ID_RASC: maxpixels /= 16; break; From patchwork Fri Dec 15 01:48:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 45154 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp5364740pzf; Thu, 14 Dec 2023 17:48:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IEnYLk/MrTGC3fBSwUs2Hf6uOWOp8q1Msa+sNXtxjC1aHNwh6le8FVUHB9RTl/fPZzd/WqM X-Received: by 2002:a50:9f44:0:b0:552:3553:4546 with SMTP id b62-20020a509f44000000b0055235534546mr3455972edf.4.1702604930705; Thu, 14 Dec 2023 17:48:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702604930; cv=none; d=google.com; s=arc-20160816; b=zHeLp6MM03fPp1txOq3VpUN/Ek3uVXVdEjTNKuEkL/ZSKzu7eB3GWmTKQnEXHmPJiV WfXBV70vfHqI1W0SBJzEwGCC/JfdnG2uBHdhrBESxW5TTYw03qmxZ3HRoSx1bNmJV6xb vDv/+i6H3ZCol+C6CFnZ3DzsWCGhfEU4zixv3cuh2lwR2ruRI/5CQoZ50xgq9VkibVoR RFqhFQGhAzSOLNiF3YtLSdQueW1rpRM+1hNU/Gl/qMMK+pOERpR+ys8nInlEi1YkN9Bg nneJWsWrdk/3yJ2jRH45PdBvM0arN9l+GikGySJOUjZ6+nOmdx+8OVzI0lsLRdfkw9PS 0spQ== 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:dkim-signature:delivered-to; bh=Y55mFkqXcysWQSoocxqfyLUk2SKpSgo5F1vVuFZMqqA=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=YCAs8UNbjU7dIozzxQtpFhuAVdPMSQaghkYdlBc85ITH3L89fPphurQSdtuvWQywP0 NB+YcxhlP1f6K2YTnGjhVO2SZq9Ro2SjfoRGFlLeIGTXqO43IYAMw4OevY4FCSew0hvm FseN/jGROFztyySqGoL/TFZsxTgU2ZnwRGk6UFk2z35OIT+vOT5JSbnG83/B9jJgSelC 0/HJ7P9+yRndDsAqP9xqbPENOaEkeK+WlPnq0acLjLWjZEIc68jAbzAaxefLcItl9amY BZart3sUR5AvYZMHw4z2efIjwniEN6fCwiGQyNAbtHQ0ctO9bZGl1QDU/d6XI/juVdm2 AmEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=GRpGfmWY; 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 g9-20020a056402090900b0055146a5fde4si3635154edz.667.2023.12.14.17.48.50; Thu, 14 Dec 2023 17:48:50 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=GRpGfmWY; 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 F2D1868D230; Fri, 15 Dec 2023 03:48:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B424C68D11B for ; Fri, 15 Dec 2023 03:48:30 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 04BD81BF206 for ; Fri, 15 Dec 2023 01:48:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1702604910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=mplAQEgUoDnHv2oobyTE8Z/VaVZKurEScLYMRvjzCDM=; b=GRpGfmWYHrOGnzoRuTwLISwg/A4CUHFxbE46fc1fhXS/DNZnwHOfAjLQp1N78qx/osOZG7 oT6zsMTTEHwd28HgC9qqD4ghpa3ObIxS5qQBoYydo6T7xAlpbBh7xvSWuI9kkvCxYAIUCp Hl6kiVhHy9Hz0vDj5ugJlUvI93/QaBPMKsmdOKzNXml8XQM1RqidAZ9zoiqBK/wYjQSLiM 4zRRNhpKQnQ+txwCEEaFvlb02QxRgAu1n2Ot6hlMahqy4syvckkA2h8/btA8Me1rP/v1T8 p4G/4URHkiqkVbsipKilj1zdg951TXcpZpAS9yEcS3qUsyNJRSfVUaXGvxfbNg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 15 Dec 2023 02:48:27 +0100 Message-Id: <20231215014828.8115-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231215014828.8115-1-michael@niedermayer.cc> References: <20231215014828.8115-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/jpegxl_parser: Add padding to cs_buffer 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: KlJCehi5awcq Fixes: out of array access Fixes: 64081/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6151006496620544 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/jpegxl_parser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/jpegxl_parser.c b/libavcodec/jpegxl_parser.c index 006eb6b2954..a2f9a053018 100644 --- a/libavcodec/jpegxl_parser.c +++ b/libavcodec/jpegxl_parser.c @@ -162,7 +162,7 @@ typedef struct JXLParseContext { int skipped_icc; int next; - uint8_t cs_buffer[4096]; + uint8_t cs_buffer[4096 + AV_INPUT_BUFFER_PADDING_SIZE]; } JXLParseContext; /* used for reading brotli prefixes */ @@ -1391,7 +1391,7 @@ static int try_parse(AVCodecParserContext *s, AVCodecContext *avctx, JXLParseCon if (ctx->container || AV_RL64(buf) == FF_JPEGXL_CONTAINER_SIGNATURE_LE) { ctx->container = 1; ret = ff_jpegxl_collect_codestream_header(buf, buf_size, ctx->cs_buffer, - sizeof(ctx->cs_buffer), &ctx->copied); + sizeof(ctx->cs_buffer) - AV_INPUT_BUFFER_PADDING_SIZE, &ctx->copied); if (ret < 0) return ret; ctx->collected_size = ret; @@ -1400,7 +1400,7 @@ static int try_parse(AVCodecParserContext *s, AVCodecContext *avctx, JXLParseCon return AVERROR_BUFFER_TOO_SMALL; } cs_buffer = ctx->cs_buffer; - cs_buflen = FFMIN(sizeof(ctx->cs_buffer), ctx->copied); + cs_buflen = FFMIN(sizeof(ctx->cs_buffer) - AV_INPUT_BUFFER_PADDING_SIZE, ctx->copied); } else { cs_buffer = buf; cs_buflen = buf_size; From patchwork Fri Dec 15 01:48:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 45155 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp5364780pzf; Thu, 14 Dec 2023 17:48:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IHsTEt5kxnIXhBRMDeZsW3q3wEUeSpuebB2TNHz0eOFuONbMfG3Amk6uu0VTVJxPHKvrVE2 X-Received: by 2002:a17:907:a805:b0:9e6:69d:46b4 with SMTP id vo5-20020a170907a80500b009e6069d46b4mr11209931ejc.6.1702604938708; Thu, 14 Dec 2023 17:48:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702604938; cv=none; d=google.com; s=arc-20160816; b=ccNY6bBOPPNobf0NZ4XLx6Q3MnmIdAvHFsisqS0/IH1ukg44L2tH12JLVO3RXYl08p IEqX2iWoIA31scXrD+gnMOOjhU3eugSSQ7/7EmfyS1497kPv7nIy/nqtx8BsD/sbAGDj CQWt70EANoDVqvt3KIJjrirEdXHZXUceyTo02+8GYRZCqsNV0RAktHhVHv1J11JrGT+k x2KgAbmdoXN+V+lknNNLpCrBsWJXNN50zbpCWfpSU7v8on+jpKWkrKZGzhKtKTScHgQx Ef3YH7V8OfEz/AVKg4jsu5XWbt6ePMi3ljRcYsIy9CTdC3Bq6WnTPVBzSGx0H1XQoM+g +Buw== 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:dkim-signature:delivered-to; bh=LTRMkxdXgLwX8kob5z7f2kVPM0d1tC7WYKFlN6D0uTE=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=uB2vgysI2kgGfCFs/sq1rDSOjVM15pSuyb16BhIEKIrv6xqiOUARpi6wKSBu94OeBC iYJ1VjFgSbtcnpX6jGtsxy2ZQu6FiuFrVDiqpWQTpnIDMzmkqITViqEMpJs3lMhBRAUC +6M7s9/OiD9WsC+x8U+lLunf9hMV1/Qv2eMC0HazDUnO8USos2zHeSDcsriUscJ+62wN kLwOAHY+JqHvGkDY9pMpKtspQ8mUBW3Jd/CK7DQtl2GAySbllfUaE5PZeYK2jfcixiny FqDt+L37G4tGh0kdVpsjg0qszZSCuB0RxC98ZE8dsp95UJEjF+J9AqI+CBGNNimVWsyt ENDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=gumA18zU; 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 ka12-20020a170907990c00b00a2313e489a9si580056ejc.727.2023.12.14.17.48.58; Thu, 14 Dec 2023 17:48:58 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=gumA18zU; 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 2E66668D294; Fri, 15 Dec 2023 03:48:40 +0200 (EET) 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 B316368D230 for ; Fri, 15 Dec 2023 03:48:31 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id E0AE420002 for ; Fri, 15 Dec 2023 01:48:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1702604911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=j/xgszW3JPrxGWWwcajZ4KbrWhJYVo81xt0Pmm9DbTI=; b=gumA18zUnUHLQLUKg0RVQHLaYgHRg0JYDyoYoOa/Tv7KglrTTQVxpYIwdewINSIR9IE4JN 55b+Gm9Ay43a+W5P1woBljWi095J6TKoVX9PFrPttJbiC1lSnT43Rr3C1nrI046uxHL+oi F10diR8Dfmffx4cR/2eFwKxa4p6KupvFhRx4dltpXo5K+2oic6cs6JuFEoQSkUjaPvq05G qVGnBg1rWEjZT8/m++m3PXQEKMQMZI34mJS55oXHX6GZedahkn3H6sfFe4gbHqe2YNXb86 Nm8VO6mm+EaJZgHh8kgviueVz3cJ6GrLmSbFgrj95JifQ/Ag4RYdzRFu0o6/lw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 15 Dec 2023 02:48:28 +0100 Message-Id: <20231215014828.8115-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231215014828.8115-1-michael@niedermayer.cc> References: <20231215014828.8115-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/leaddec: Check remaining bits in decode_block() 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: MYzYVGhIKagS Fixes: Timeout Fixes: 64163/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LEAD_fuzzer-6418925835124736 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/leaddec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/leaddec.c b/libavcodec/leaddec.c index ede52fba5a9..4e97479b03c 100644 --- a/libavcodec/leaddec.c +++ b/libavcodec/leaddec.c @@ -104,6 +104,9 @@ static int decode_block(LeadContext * s, GetBitContext * gb, s->bdsp.clear_block(block); + if (get_bits_left(gb) <= 0) + return AVERROR_INVALIDDATA; + size = get_vlc2(gb, dc_table, dc_bits, 1); if (size < 0) return AVERROR_INVALIDDATA;