onkelbeh
/
GentooRepository
mirror of https://github.com/gentoo-mirror/gentoo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <torokhov-s-a@yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/35687
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sergey Torokhov 2024-03-09 21:49:17 +03:00 committed by Sam James
parent 1942cc9d81
commit ea2b6a11ac
No known key found for this signature in database
GPG Key ID: 738409F520DF9190
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dev-util/codeblocks/codeblocks-20.03-r7.ebuild
View File

@ -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() {

24
dev-util/codeblocks/files/codeblocks-20.03_Scintilla_fix_buffer_over-read_with_absolute_reference.patch Normal file
View File

@ -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);