From patchwork Mon Sep 23 21:32:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 51777 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2738773vqb; Mon, 23 Sep 2024 14:44:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVjYfnieB5nFsmy2YCaninVOJ/fBSP+BIqL4znVAzfTGrZDjK34nDVZ/UzxyzfdKPq0iIHN4JbB2oISjofG7f0e@gmail.com X-Google-Smtp-Source: AGHT+IFn8ZwxmwyuFTrz+8wpToewlGIV8/7OeYNJPphTH43yyzbr/LWt1lfs94ij+NXGn6NNHEf/ X-Received: by 2002:a05:6512:2811:b0:530:e323:b1cd with SMTP id 2adb3069b0e04-536ad3d7255mr7010875e87.40.1727127860130; Mon, 23 Sep 2024 14:44:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727127860; cv=none; d=google.com; s=arc-20240605; b=cpCeXwRv+hBQRgkGqhP65S6v8iAMHnc56wC64y8t67+0jQEY3ZEE/XANoeC/KC6+qB t8XUTBg9ZBkKEfxwRxxyUxhr1bgcYqoSf2Te4IHMSwIkEkx3W/Yi0TXUujBCyCdcuuKb FVON112e97vEwKVDEaEH4HfPYPm0uzFWRSwID9tLs/DHp6nRPZhHDFzBSSq55sToc3QS s5mEy2OZzbgEx+kK/S+AotqZ53f79pteI3I6nstjtZgSKJ8E1qyIqBnUlRYRFOC8Wgd+ vbLQhHwGVD8SMYuKJqCefGYRdzWQr6HSsI9IY+cVl5/Lw4M4u6j+6r0Z271N1uRUjW2X uC+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=5S2DAmOhdfP9BS3Sf2NfznhYQc8ZfmPuYnVD3UFPjn8=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=CBzBx0qrrt5Ecj8lGaMASXyhfFNMoO4gmsIujgr6vXeWkb2qbBF9zVfCnvNEctoG+K WE4sILlpQM1fdoUf4sq5ZnJUZ7UIzX4vBKyWSti6eFQPSY3nRUImfInD7visrOHyYaG2 ECJg/oXNkeM5TZO9Z3txRMc8BDcW3Ax/sBJf2IncDAjbGt/yWQXll5vEwY8PNRaMcxxl mx5jdcbH4kFfSWqO8Q89qyDQ/F9S+hHGXQDS9ft9/fx7qtrccsxaPHtMHGhfUKLf+Gch hhIDGwLwNknQnCX4jk8GykEpC5JgzUJFYWXxOkVkyXkMF+Y44qP+BZxsf0flfH6/wXvt u/cg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=aOfqzXn6; 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 2adb3069b0e04-537a85ee55asi31421e87.136.2024.09.23.14.44.19; Mon, 23 Sep 2024 14:44:20 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=aOfqzXn6; 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 017BB68DB29; Tue, 24 Sep 2024 00:33:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 06A3E68DA4D for ; Tue, 24 Sep 2024 00:32:56 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 4278C60004 for ; Mon, 23 Sep 2024 21:32:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1727127176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tBNvjiL80ZYZscNqMk27NWNaAXIiY0Udx8IAdH9/7Jk=; b=aOfqzXn61KSEf7PK+g+6voRcwhKO0n2Dm4BSppu9GIzLhSDxrqTswhhdiRyFTizX1FHV2L b3zX7cODJqCtBHyD9rwoEz5WoSWEIec19rIAGAMGuE+nOxzo3qTFB4Hs0Pg/IPNCN3POol leCOkrEBpHK++/a/INLK98QGphhU614v1J2hgTVjuoU+7X9yxXmk36qp4J6Iy0tQAJpgtV xgNUcShwog3+EsRWJuS29yHvmLmdx/hSo0MeR4IJ1qNsBDqIWoMy0nOqVfswAN4vdeD3ju hhA2vSVYdkOgNf3uD79OgDEMM7jwjhGv2qOTi4gC6R4PJ7YOQWSadUVnc/XLuw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 23 Sep 2024 23:32:48 +0200 Message-ID: <20240923213249.3256534-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240923213249.3256534-1-michael@niedermayer.cc> References: <20240923213249.3256534-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 6/7] avcodec/get_bits: dont add a null to a 0 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WqfA8tcURhKf Fixes: undefined behavior Fixes: 71747/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5427736120721408 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/get_bits.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index fe2f6378b45..beeff87a79b 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -528,7 +528,7 @@ static inline int init_get_bits(GetBitContext *s, const uint8_t *buffer, s->buffer = buffer; s->size_in_bits = bit_size; s->size_in_bits_plus8 = bit_size + 8; - s->buffer_end = buffer + buffer_size; + s->buffer_end = buffer ? buffer + buffer_size : NULL; s->index = 0; return ret;