Date: Sat, 13 Jun 2026 11:21:42 +0000 From: Roman Bogorodskiy <novel@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 436f729ca814 - 2026Q2 - x11-wm/obconf: fix crash on theme change Message-ID: <6a2d3d46.40b62.36d9c252@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch 2026Q2 has been updated by novel: URL: https://cgit.FreeBSD.org/ports/commit/?id=436f729ca814b5780fda5a417eb38d89e0b9aecb commit 436f729ca814b5780fda5a417eb38d89e0b9aecb Author: Roman Bogorodskiy <novel@FreeBSD.org> AuthorDate: 2026-06-09 07:58:59 +0000 Commit: Roman Bogorodskiy <novel@FreeBSD.org> CommitDate: 2026-06-13 11:20:17 +0000 x11-wm/obconf: fix crash on theme change Fix crashing on theme change caused by incorrect error handling. PR: 295921 Reported by: fernape (cherry picked from commit d0654a3fb62625e87dae24308ebdfebda6e088a8) --- x11-wm/obconf/Makefile | 2 +- x11-wm/obconf/files/patch-src_tree.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/x11-wm/obconf/Makefile b/x11-wm/obconf/Makefile index 83e9a1cd282b..64a258a90ffb 100644 --- a/x11-wm/obconf/Makefile +++ b/x11-wm/obconf/Makefile @@ -1,6 +1,6 @@ PORTNAME= obconf PORTVERSION= 2.0.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-wm MASTER_SITES= http://openbox.org/dist/obconf/ diff --git a/x11-wm/obconf/files/patch-src_tree.c b/x11-wm/obconf/files/patch-src_tree.c new file mode 100644 index 000000000000..705d6fba1bec --- /dev/null +++ b/x11-wm/obconf/files/patch-src_tree.c @@ -0,0 +1,20 @@ +--- src/tree.c.orig 2026-06-08 11:58:29 UTC ++++ src/tree.c +@@ -88,7 +88,7 @@ void tree_apply() + void tree_apply() + { + gchar *p, *d; +- gboolean err; ++ gboolean err = FALSE; + + if (obc_config_file) + p = g_strdup(obc_config_file); +@@ -102,6 +102,8 @@ void tree_apply() + + if (!obt_xml_save_file(parse_i, p, TRUE)) { + gchar *s; ++ ++ err = TRUE; + s = g_strdup_printf("An error occured while saving the " + "config file '%s'", p); + obconf_error(s, FALSE);home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a2d3d46.40b62.36d9c252>