646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
21 lines
749 B
Diff
21 lines
749 B
Diff
pal16bxcl is an array of 256 dwords, not bytes:
|
|
src/endmem.asm:NEWSYM pal16bxcl, resd 256
|
|
|
|
While at it fixes off-by-4 out of bounds exit.
|
|
|
|
Detected by _FORTIFY_SOURCE=3:
|
|
*** buffer overflow detected ***: terminated
|
|
#7 0x08057c14 in memset (__len=2, __ch=255, __dest=<optimized out>) at ...-glibc-2.38-23-dev/include/bits/string_fortified.h:59
|
|
#8 clearmem () at initc.c:1461
|
|
--- a/src/initc.c
|
|
+++ b/src/initc.c
|
|
@@ -1389,7 +1389,7 @@ extern unsigned char vidmemch8[4096];
|
|
extern unsigned char pal16b[1024];
|
|
extern unsigned char pal16bcl[1024];
|
|
extern unsigned char pal16bclha[1024];
|
|
-extern unsigned char pal16bxcl[256];
|
|
+extern unsigned char pal16bxcl[1024];
|
|
extern unsigned char SPCRAM[65472];
|
|
unsigned char *SPCState = SPCRAM;
|
|
|