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!
This commit is contained in:
fcambus 2020-12-18 15:32:58 +00:00
parent e3214e3b14
commit 2a15af466f
3 changed files with 38 additions and 1 deletions

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.8 2020/12/07 13:30:12 fcambus Exp $
# $OpenBSD: Makefile,v 1.9 2020/12/18 15:32:58 fcambus Exp $
COMMENT = swiss army knife for video game console emulators
DISTNAME = ucon64-2.2.1-src
PKGNAME = ${DISTNAME:S/-src//}
REVISION = 0
CATEGORIES = emulators

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_libdiscmage_misc_c,v 1.1 2020/12/18 15:32:58 fcambus Exp $
Fixed crash in change_mem2() on 64-bit platforms.
Patch from upstream: https://sourceforge.net/p/ucon64/svn/2822/
Index: src/libdiscmage/misc.c
--- src/libdiscmage/misc.c.orig
+++ src/libdiscmage/misc.c
@@ -1874,7 +1874,7 @@ change_mem2 (char *buf, size_t bufsize, char *searchst
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

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_misc_misc_c,v 1.1 2020/12/18 15:32:58 fcambus Exp $
Fixed crash in change_mem2() on 64-bit platforms.
Patch from upstream: https://sourceforge.net/p/ucon64/svn/2822/
Index: src/misc/misc.c
--- src/misc/misc.c.orig
+++ src/misc/misc.c
@@ -501,7 +501,7 @@ change_mem2 (char *buf, size_t bufsize, char *searchst
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