From owner-dev-commits-ports-main@freebsd.org Thu May 13 12:58:33 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CA63963F9F4; Thu, 13 May 2021 12:58:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FgsCs5NRMz4sNh; Thu, 13 May 2021 12:58:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AC0621F3AC; Thu, 13 May 2021 12:58:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14DCwXrq014575; Thu, 13 May 2021 12:58:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14DCwXUF014574; Thu, 13 May 2021 12:58:33 GMT (envelope-from git) Date: Thu, 13 May 2021 12:58:33 GMT Message-Id: <202105131258.14DCwXUF014574@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?B?RmVybmFuZG8gQXBlc3RlZ3XDrWE=?= Subject: git: 339d443d7b97 - main - games/3dc: Fix crash on boot MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 339d443d7b97dcef2ad415ff9cf743685ebea304 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 May 2021 12:58:33 -0000 The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=339d443d7b97dcef2ad415ff9cf743685ebea304 commit 339d443d7b97dcef2ad415ff9cf743685ebea304 Author: Fernando Apesteguía AuthorDate: 2021-05-12 09:01:40 +0000 Commit: Fernando Apesteguía CommitDate: 2021-05-13 12:51:00 +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 --- 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);