forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
zsnes: fix buffer size marking to avoid crash on _FORTIFY_SOURCE=3
Without the change `zsnesn` startup crashes with: $ gdb zsnes *** buffer overflow detected ***: terminated ... NixOS#7 0x08057c14 in memset (__len=2, __ch=255, __dest=<optimized out>) at ...-glibc-2.38-23-dev/include/bits/string_fortified.h:59
- Loading branch information
Showing
2 changed files
with
33 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
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; | ||
|
||
@@ -1456,7 +1456,7 @@ void clearmem() | ||
memset(pal16b, 0, 1024); | ||
memset(pal16bcl, 0, 1024); | ||
memset(pal16bclha, 0, 1024); | ||
- for (i=0 ; i<1024 ; i+=4) | ||
+ for (i=0 ; i<1024-4 ; i+=4) | ||
{ | ||
memset(pal16bxcl+i, 255, 2); | ||
memset(pal16bxcl+i+2, 0, 2); |