diff options
| author | fcambus <fcambus@pkgsrc.org> | 2020-12-20 15:15:01 +0000 |
|---|---|---|
| committer | fcambus <fcambus@pkgsrc.org> | 2020-12-20 15:15:01 +0000 |
| commit | dc84b662757055bd635d065f5feb34e99a958ea0 (patch) | |
| tree | 7af35771ec500ad49b4cd0ef8d2a7ef4184de9f4 /emulators | |
| parent | 1f3b2e67ede0dbd4bbb9fb269a92494c431518d4 (diff) | |
| download | pkgsrc-dc84b662757055bd635d065f5feb34e99a958ea0.tar.gz | |
ucon64: fix crash in change_mem2() on 64-bit platforms.
Patch from upstream: https://sourceforge.net/p/ucon64/svn/2822/
Thanks to Daniel Horchner for the heads up!
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/ucon64/Makefile | 3 | ||||
| -rw-r--r-- | emulators/ucon64/distinfo | 4 | ||||
| -rw-r--r-- | emulators/ucon64/patches/patch-libdiscmage_misc.c | 17 | ||||
| -rw-r--r-- | emulators/ucon64/patches/patch-misc_misc.c | 17 |
4 files changed, 39 insertions, 2 deletions
diff --git a/emulators/ucon64/Makefile b/emulators/ucon64/Makefile index 83657d1be87..2f7a1734ddc 100644 --- a/emulators/ucon64/Makefile +++ b/emulators/ucon64/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.17 2020/12/05 13:16:36 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2020/12/20 15:15:01 fcambus Exp $ DISTNAME= ucon64-2.2.1-src PKGNAME= ${DISTNAME:S/-src//} +PKGREVISION= 1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ucon64/} diff --git a/emulators/ucon64/distinfo b/emulators/ucon64/distinfo index a6baae540c4..4a50043d79f 100644 --- a/emulators/ucon64/distinfo +++ b/emulators/ucon64/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.11 2020/12/05 13:16:36 wiz Exp $ +$NetBSD: distinfo,v 1.12 2020/12/20 15:15:01 fcambus Exp $ SHA1 (ucon64-2.2.1-src.tar.gz) = bfc6fad1b82cb0d5ffe734f46d088567e8d93126 RMD160 (ucon64-2.2.1-src.tar.gz) = ca363e350be23fa2f083deb598efab307066b231 SHA512 (ucon64-2.2.1-src.tar.gz) = 34453399151e5ed256fdcf387b9d32a052718b264e51b99a2be251b90589337d13cd317f8d1aa7d3c8e39c8e407b22797d4608ec6d14b99c8673ec74f349f6c2 Size (ucon64-2.2.1-src.tar.gz) = 1476080 bytes SHA1 (patch-libdiscmage_ioapi.h) = a5857b1623a3180d09e19815e261f23491aaad96 +SHA1 (patch-libdiscmage_misc.c) = df3124b713b9db5379fa2bfd529c5637b6e8f6d0 SHA1 (patch-misc_ioapi.h) = dc2939f8f404e25a7dcb841555024551f2962984 +SHA1 (patch-misc_misc.c) = 528e1f79df8c01841a95c0632becf8fcd1358255 diff --git a/emulators/ucon64/patches/patch-libdiscmage_misc.c b/emulators/ucon64/patches/patch-libdiscmage_misc.c new file mode 100644 index 00000000000..2b609de53e0 --- /dev/null +++ b/emulators/ucon64/patches/patch-libdiscmage_misc.c @@ -0,0 +1,17 @@ +$NetBSD: patch-libdiscmage_misc.c,v 1.1 2020/12/20 15:15:02 fcambus Exp $ + +Fixed crash in change_mem2() on 64-bit platforms. + +Patch from upstream: https://sourceforge.net/p/ucon64/svn/2822/ + +--- libdiscmage/misc.c.orig 2020-07-03 08:13:04.000000000 +0000 ++++ libdiscmage/misc.c +@@ -1874,7 +1874,7 @@ change_mem2 (char *buf, size_t bufsize, + + if (strpos == pos_1st_esc) + setindex = 0; // reset argument pointer +- if (pos_1st_esc == (unsigned int) -1) ++ if (pos_1st_esc == (size_t) -1) + pos_1st_esc = strpos; + + set = sets[setindex].data; // get next set of characters diff --git a/emulators/ucon64/patches/patch-misc_misc.c b/emulators/ucon64/patches/patch-misc_misc.c new file mode 100644 index 00000000000..d5c083694f3 --- /dev/null +++ b/emulators/ucon64/patches/patch-misc_misc.c @@ -0,0 +1,17 @@ +$NetBSD: patch-misc_misc.c,v 1.1 2020/12/20 15:15:02 fcambus Exp $ + +Fixed crash in change_mem2() on 64-bit platforms. + +Patch from upstream: https://sourceforge.net/p/ucon64/svn/2822/ + +--- misc/misc.c.orig 2020-07-03 08:09:50.000000000 +0000 ++++ misc/misc.c +@@ -501,7 +501,7 @@ change_mem2 (char *buf, size_t bufsize, + + if (strpos == pos_1st_esc) + setindex = 0; // reset argument pointer +- if (pos_1st_esc == (unsigned int) -1) ++ if (pos_1st_esc == (size_t) -1) + pos_1st_esc = strpos; + + set = sets[setindex].data; // get next set of characters |