git: 1d7c23d087f7 - main - x11/fvwm3: Fix FvwmIconMan module segfault
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 19 Jul 2022 12:43:20 UTC
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1d7c23d087f79fa348a421cc4129e613f7086402
commit 1d7c23d087f79fa348a421cc4129e613f7086402
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2022-07-19 12:34:07 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
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 <felix@palmen-it.de> (Maintainer)
Reported by: anubhav.x61+freebsd@gmail.com
Approved by: Felix Palmen <felix@palmen-it.de> (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,