From nobody Tue Jul 19 12:43:20 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LnJQw6y41z4XDXv; Tue, 19 Jul 2022 12:43:20 +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 4LnJQw6RcCz3N3c; Tue, 19 Jul 2022 12:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658234600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e08kb4OqVPXluwcIAQWHkDQRk+wFW3Ae7te+b5Ot1Yo=; b=GqHFztas6nHKHGGn5qkR1BiTjLXn5FK3Z6hBdNgbU6j49QhufqEtOa/DA2PDVpzZEFrYEj jcyjVoZZvFxSaWiKM5901LXGtsz+l54t8XSaRT/cwdMUlhlY0m6hHorJ3DUCCez76HX2Sf 6P8bW2ewcgOlVsPSBQk8YqGwd5YMqg0CYaU4RHyy82uyFJyRtrHNDPSxeIR7lDYnr3oYMB NgHRZyTZrTnLckdXspIt88MxlbD5wg7LeVMwLtpGbIv+6byEx4JMOuRBp0ITeyUs/T5KIP mlLYqWiODjBYqRi9AE6KR6up3eCNU9+ALYYHnKpc0+d3LrDPUQ2T/3E5hXKH0Q== 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 4LnJQw58hLzKSD; Tue, 19 Jul 2022 12:43:20 +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 26JChKvR042632; Tue, 19 Jul 2022 12:43:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26JChK0R042631; Tue, 19 Jul 2022 12:43:20 GMT (envelope-from git) Date: Tue, 19 Jul 2022 12:43:20 GMT Message-Id: <202207191243.26JChK0R042631@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 1d7c23d087f7 - main - x11/fvwm3: Fix FvwmIconMan module segfault List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d7c23d087f79fa348a421cc4129e613f7086402 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658234600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e08kb4OqVPXluwcIAQWHkDQRk+wFW3Ae7te+b5Ot1Yo=; b=p1Lg+ijyJgMCaoLcemR3hSYfZWHRJXMppe9vmcROqIfouW+22Z4qVs1rikjXl7nSWqTtKt of7G2soVqj5fwBE3HHvlDDeYEjkhILbgGjzD9ykLnXDM2yhIxHpgWZVhoGABtn2CQCI6Wi 6zHUZxeFSVquoFi7R6aFooHNvWyazXMfAVxMbLJkiZLCNtUPStYdxX0Va2HMYxCvbuWr7z 2yVYqzfY7g4C5+lSVpKxYGYO81u8joaqniN0tbieJ7hmTkwIcjnQ5YEgZCV7oiUU9U+oNq alY0LHuwGSAz3/avbg5E8vo3I39JIvrd7xz9zaWSBbDbgtNf6OKs/hIH5Pum8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658234600; a=rsa-sha256; cv=none; b=E+id3xrY0IEVYv1f9Y2NX8HxBj0odmRzJcl4G66l6lIJARGpdFyWvhpo5ojEoEeTg0/VXM W+4+uSqWQ52A40Gw8Ro23L3FsEVTbD9LFxlIZrHCIwonrintntwxlBGCvIytyv7X4Tn1OB GOn8FDq6Qome/LafkCzf6bEvinsXPiFP+xlRVKqe09Yfjxz2iNKDRjDzkthrAbAFe61q5c 7u3gbfwbD76kMK1wiBdqOrkSHJhqtFC/aLhEfVUA+VwAm5NKhZqVrPh/V2hG2APDzRuPz6 L5OCV6gi5XvQkEGfU9QOo/CZT9EzRWEi4/smhMwshLu7mJbHToHCx1R7zPe9kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d7c23d087f79fa348a421cc4129e613f7086402 commit 1d7c23d087f79fa348a421cc4129e613f7086402 Author: Cy Schubert AuthorDate: 2022-07-19 12:34:07 +0000 Commit: Cy Schubert CommitDate: 2022-07-19 12:43:15 +0000 x11/fvwm3: Fix FvwmIconMan module segfault Initialize the offending field in the fscreen_scr_arg struct to NULL, fixing the segfault. PR: 265291 Submitted by: Felix Palmen (Maintainer) Reported by: anubhav.x61+freebsd@gmail.com Approved by: Felix Palmen (Maintainer) --- x11-wm/fvwm3/Makefile | 2 +- x11-wm/fvwm3/files/patch-modules_FvwmIconMan_x.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/x11-wm/fvwm3/Makefile b/x11-wm/fvwm3/Makefile index a6d01d7d4592..b2a4d67fa8a4 100644 --- a/x11-wm/fvwm3/Makefile +++ b/x11-wm/fvwm3/Makefile @@ -2,7 +2,7 @@ PORTNAME= fvwm3 PORTVERSION= 1.0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= https://github.com/fvwmorg/fvwm3/releases/download/${PORTVERSION}/ \ http://fvwm.sourceforge.net/generated/icon_download/:icons diff --git a/x11-wm/fvwm3/files/patch-modules_FvwmIconMan_x.c b/x11-wm/fvwm3/files/patch-modules_FvwmIconMan_x.c new file mode 100644 index 000000000000..a525fb032feb --- /dev/null +++ b/x11-wm/fvwm3/files/patch-modules_FvwmIconMan_x.c @@ -0,0 +1,10 @@ +--- modules/FvwmIconMan/x.c.orig 2022-07-18 23:18:50 UTC ++++ modules/FvwmIconMan/x.c +@@ -742,6 +742,7 @@ void X_init_manager (int man_id) + char *scr; + fscreen_scr_arg arg; + arg.mouse_ev = NULL; ++ arg.name = NULL; + + geometry_mask = FScreenParseGeometryWithScreen( + man->geometry_str, &man->geometry.x, &man->geometry.y,