pyrox.dev
Merge pull request #263444 from trofi/zsnes-zlib-1.3-fix
zsnes: fix build against zlib-1.3
authored by Peder Bergebakken Sundt and committed by GitHub 5628bfe7 60ffc2aa
+5
pkgs/applications/emulators/zsnes/default.nix
+5
pkgs/applications/emulators/zsnes/default.nix
+29
pkgs/applications/emulators/zsnes/fortify3.patch
+29
pkgs/applications/emulators/zsnes/fortify3.patch
···
1
+
pal16bxcl is an array of 256 dwords, not bytes:
2
+
src/endmem.asm:NEWSYM pal16bxcl, resd 256
3
+
4
+
While at it fixes off-by-4 out of bounds exit.
5
+
6
+
Detected by _FORTIFY_SOURCE=3:
7
+
*** buffer overflow detected ***: terminated
8
+
#7 0x08057c14 in memset (__len=2, __ch=255, __dest=<optimized out>) at ...-glibc-2.38-23-dev/include/bits/string_fortified.h:59
9
+
#8 clearmem () at initc.c:1461
10
+
--- a/src/initc.c
11
+
+++ b/src/initc.c
12
+
@@ -1389,7 +1389,7 @@ extern unsigned char vidmemch8[4096];
13
+
extern unsigned char pal16b[1024];
14
+
extern unsigned char pal16bcl[1024];
15
+
extern unsigned char pal16bclha[1024];
16
+
-extern unsigned char pal16bxcl[256];
17
+
+extern unsigned char pal16bxcl[1024];
18
+
extern unsigned char SPCRAM[65472];
19
+
unsigned char *SPCState = SPCRAM;
20
+
21
+
@@ -1456,7 +1456,7 @@ void clearmem()
22
+
memset(pal16b, 0, 1024);
23
+
memset(pal16bcl, 0, 1024);
24
+
memset(pal16bclha, 0, 1024);
25
+
- for (i=0 ; i<1024 ; i+=4)
26
+
+ for (i=0 ; i<1024-4 ; i+=4)
27
+
{
28
+
memset(pal16bxcl+i, 255, 2);
29
+
memset(pal16bxcl+i+2, 0, 2);
+41
pkgs/applications/emulators/zsnes/zlib-1.3.patch
+41
pkgs/applications/emulators/zsnes/zlib-1.3.patch
···
1
+
Add support for 2-digit zlib version like "1.3".
2
+
--- a/src/acinclude.m4
3
+
+++ b/src/acinclude.m4
4
+
@@ -67,7 +67,7 @@ char* my_strdup (char *str)
5
+
6
+
int main (int argc, char *argv[])
7
+
{
8
+
- int major, minor, micro, zlib_major_version, zlib_minor_version, zlib_micro_version;
9
+
+ int major, minor, micro, zlib_major_version, zlib_minor_version, zlib_micro_version = 0;
10
+
11
+
char *zlibver, *tmp_version;
12
+
13
+
@@ -85,7 +85,7 @@ int main (int argc, char *argv[])
14
+
printf("%s, bad version string for\n\tmin_zlib_version... ", "$min_zlib_version");
15
+
exit(1);
16
+
}
17
+
- if (sscanf(zlibver, "%d.%d.%d", &zlib_major_version, &zlib_minor_version, &zlib_micro_version) != 3) {
18
+
+ if (sscanf(zlibver, "%d.%d.%d", &zlib_major_version, &zlib_minor_version, &zlib_micro_version) != 3 && sscanf(zlibver, "%d.%d", &zlib_major_version, &zlib_minor_version) != 2) {
19
+
printf("%s, bad version string given\n", zlibver);
20
+
puts("\tby zlib, sometimes due to very old zlibs that didnt correctly");
21
+
printf("\tdefine their version. Please upgrade if you are running an\n\told zlib... ");
22
+
--- a/src/configure
23
+
+++ b/src/configure
24
+
@@ -3817,7 +3817,7 @@ char* my_strdup (char *str)
25
+
26
+
int main (int argc, char *argv[])
27
+
{
28
+
- int major, minor, micro, zlib_major_version, zlib_minor_version, zlib_micro_version;
29
+
+ int major, minor, micro, zlib_major_version, zlib_minor_version, zlib_micro_version = 0;
30
+
31
+
char *zlibver, *tmp_version;
32
+
33
+
@@ -3835,7 +3835,7 @@ int main (int argc, char *argv[])
34
+
printf("%s, bad version string for\n\tmin_zlib_version... ", "$min_zlib_version");
35
+
exit(1);
36
+
}
37
+
- if (sscanf(zlibver, "%d.%d.%d", &zlib_major_version, &zlib_minor_version, &zlib_micro_version) != 3) {
38
+
+ if (sscanf(zlibver, "%d.%d.%d", &zlib_major_version, &zlib_minor_version, &zlib_micro_version) != 3 && sscanf(zlibver, "%d.%d", &zlib_major_version, &zlib_minor_version) != 2) {
39
+
printf("%s, bad version string given\n", zlibver);
40
+
puts("\tby zlib, sometimes due to very old zlibs that didnt correctly");
41
+
printf("\tdefine their version. Please upgrade if you are running an\n\told zlib... ");