From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2600A158041 for ; Sat, 9 Mar 2024 20:54:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4E6BE2A3C; Sat, 9 Mar 2024 20:54:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AEEA2E2A3C for ; Sat, 9 Mar 2024 20:54:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D660033BEF1 for ; Sat, 9 Mar 2024 20:54:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F53F137F for ; Sat, 9 Mar 2024 20:54:02 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1710017618.ea2b6a11aca27a11c87862518b9a536f8af94738.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/codeblocks/, dev-util/codeblocks/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/codeblocks/codeblocks-20.03-r7.ebuild dev-util/codeblocks/files/codeblocks-20.03_Scintilla_fix_buffer_over-read_with_absolute_reference.patch X-VCS-Directories: dev-util/codeblocks/ dev-util/codeblocks/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ea2b6a11aca27a11c87862518b9a536f8af94738 X-VCS-Branch: master Date: Sat, 9 Mar 2024 20:54:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 841c18d7-960a-42a0-b278-165ac08f08a3 X-Archives-Hash: 522fca2e95fa3de9f6bf10ae55d57b50 commit: ea2b6a11aca27a11c87862518b9a536f8af94738 Author: Sergey Torokhov yandex ru> AuthorDate: Sat Mar 9 18:49:17 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sat Mar 9 20:53:38 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea2b6a11 dev-util/codeblocks: 20.03-r7, fix Scintilla buffer over-read warning Upstream patch: https://sourceforge.net/u/vic5/scintilla/ci/6d0ce3 Upstream issue: https://sourceforge.net/p/scintilla/bugs/2019/ [sam: Revbump done in previous commit.] Bug: https://bugs.gentoo.org/925955 Signed-off-by: Sergey Torokhov yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/35687 Signed-off-by: Sam James gentoo.org> dev-util/codeblocks/codeblocks-20.03-r7.ebuild | 1 + ..._buffer_over-read_with_absolute_reference.patch | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/dev-util/codeblocks/codeblocks-20.03-r7.ebuild b/dev-util/codeblocks/codeblocks-20.03-r7.ebuild index a3c08cf9ffa1..96c7e10e1ae8 100644 --- a/dev-util/codeblocks/codeblocks-20.03-r7.ebuild +++ b/dev-util/codeblocks/codeblocks-20.03-r7.ebuild @@ -51,6 +51,7 @@ PATCHES=( "${FILESDIR}"/${P}-env.patch "${WORKDIR}"/patches/ "${FILESDIR}"/${P}_fix_DoxyBlocks_startup_segfault.patch + "${FILESDIR}"/${P}_Scintilla_fix_buffer_over-read_with_absolute_reference.patch ) src_prepare() { diff --git a/dev-util/codeblocks/files/codeblocks-20.03_Scintilla_fix_buffer_over-read_with_absolute_reference.patch b/dev-util/codeblocks/files/codeblocks-20.03_Scintilla_fix_buffer_over-read_with_absolute_reference.patch new file mode 100644 index 000000000000..7ef01faf9cd2 --- /dev/null +++ b/dev-util/codeblocks/files/codeblocks-20.03_Scintilla_fix_buffer_over-read_with_absolute_reference.patch @@ -0,0 +1,24 @@ +Upstream patch: https://sourceforge.net/u/vic5/scintilla/ci/6d0ce3c92a1371372bd601cd572a078d5e4041a4/ +Upstream issue: https://sourceforge.net/p/scintilla/bugs/2019/ +Codeblocks forum discussion: https://forums.codeblocks.org/index.php?topic=24505.0 + +lexers/LexMMIXAL.cxxDiffSwitch to side-by-side view +--- a/src/sdk/wxscintilla/src/scintilla/lexers/LexMMIXAL.cxx ++++ b/src/sdk/wxscintilla/src/scintilla/lexers/LexMMIXAL.cxx +@@ -99,12 +99,11 @@ + } + } else if (sc.state == SCE_MMIXAL_REF) { // REF + if (!IsAWordChar(sc.ch) ) { +- char s[100]; +- sc.GetCurrent(s, sizeof(s)); ++ char s0[100]; ++ sc.GetCurrent(s0, sizeof(s0)); ++ const char *s = s0; + if (*s == ':') { // ignore base prefix for match +- for (size_t i = 0; i != sizeof(s); ++i) { +- *(s+i) = *(s+i+1); +- } ++ ++s; + } + if (special_register.InList(s)) { + sc.ChangeState(SCE_MMIXAL_REGISTER);