Date: Thu, 13 May 2021 13:00:02 GMT From: =?utf-8?B?RmVybmFuZG8gQXBlc3RlZ3XDrWE=?= <fernape@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 2c822c361c64 - 2021Q2 - games/3dc: Fix crash on boot Message-ID: <202105131300.14DD02ZB017507@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c822c361c643b4ff4d741f6d4d293a54ab15eb3 commit 2c822c361c643b4ff4d741f6d4d293a54ab15eb3 Author: Fernando Apesteguía <fernape@FreeBSD.org> AuthorDate: 2021-05-12 09:01:40 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2021-05-13 12:56:13 +0000 games/3dc: Fix crash on boot The call to XtVaGetValues returns a value that overwrites the `bc` variable and smashes the stack. Use a long instead. PR: 255765 Reported by: grahamperrin@gmail.com Tested by: rhurling@ MFH: 2021Q2 (cherry picked from commit 339d443d7b97dcef2ad415ff9cf743685ebea304) --- games/3dc/Makefile | 2 +- games/3dc/files/patch-xif.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/games/3dc/Makefile b/games/3dc/Makefile index 6387671812dd..bb7a5b526c20 100644 --- a/games/3dc/Makefile +++ b/games/3dc/Makefile @@ -2,7 +2,7 @@ PORTNAME= 3dc PORTVERSION= 0.8.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= SUNSITE/games/strategy DISTNAME= 3Dc-${PORTVERSION} diff --git a/games/3dc/files/patch-xif.c b/games/3dc/files/patch-xif.c new file mode 100644 index 000000000000..b184d0136707 --- /dev/null +++ b/games/3dc/files/patch-xif.c @@ -0,0 +1,11 @@ +--- xif.c.orig 2021-05-12 08:22:05 UTC ++++ xif.c +@@ -171,7 +171,7 @@ InitMainWindow( GfxInfo *gfx ) + /* undo, */ resign, + musterTitle + /* muster */; +- int bg; ++ long bg; + + form = XtVaCreateManagedWidget("form", formWidgetClass, gfx->mainWindow, + NULL);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105131300.14DD02ZB017507>