From nobody Tue Jun 9 08:03:06 2026 X-Original-To: dev-commits-ports-main@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 4gZLxk6LV6z6hZSq for ; Tue, 09 Jun 2026 08:03:06 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gZLxk5t9jz3CS1 for ; Tue, 09 Jun 2026 08:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780992186; 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=emscM0Gt3vGENkITlblN1XMacwUlZ6XoJ4h5ylBQq40=; b=TVMlGSy3M80mJ+US6RzpVp/0PnMPBbNW/QAjQYS5zIYUCOV3OY4UNYKxOr5v1GLkEBqEf4 Ax6h9FaW5aL/K1/VDl2b83zZK1Rv2kALrSvYRkX1b2uozBJ/ASeFPDheVbgDsokX1+7vSc uZ3LBp+CU7q45sE8WieNzSlIUofOF2FvRcv9M4x5CLTdtpyQYPPkdGiEmi27fuN4KwXK0D xhwf1fpJPDyIL6aQkc4aWbGiDp54GGSG6qzL8AH45f1NYTBE4gVTQu9YjqQt2mRRrQ8aYL Wt4RcfeX6lLOlw7rnjgEBLb+xVkq8GPosGzdxqyAhPjElwHRHU6gIXK5TQN2NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780992186; a=rsa-sha256; cv=none; b=W/JN9XJyZpyFjn2qY6Dh3imd24xr/HVZQE6L/l6kt/4fhbuMbiul5UJVWw+9gJZlaloo7h WRrsnnPKMyOxw4RcIbUCSKBAh8WzNEPl4Mrhp+YKea2H4qEi8jStbW6pnw0RJNyDZIM+91 Ng2hT7EId9ytK/pCDqTV4QaTTlMFKT2ohZUsh9KFda7rUc6wk3bRnD4Z0m5XLSEs9rti9O ifbUtOa7zQ0BCYtNgF4lKW+pkttxDujGZK5QrTDcrhAcEQNx57JZCJzPKsJPRrXbJWcaOR /DBJywfxW5nda4nqpxP4zUmBypgcWywuXtw/ZZPe3vLcD38veCO6piV3ICtpbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780992186; 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=emscM0Gt3vGENkITlblN1XMacwUlZ6XoJ4h5ylBQq40=; b=fd56rnoMWxvkeSUNuPfymMHXvGBDm1z+lX07Uk9vP34DfSHbvYTWlDL3GId6+mJOKQcooH Ar9Wk6hzWNPbFaIkgsHx4iiT329v25udp/3gvPb3Q2HWlX0/qDi86hVyhd5fmcwKi5InKf IAv3dkL0CLwyxYHCMGLGqMQ1L+FX56ul5gUJadctm3r9Os0emV/W2cPSjmZqVuftC5zXvb J2oGDvxqT0Gzyhix+Emmx7j1yXR9UDR9fKhlKKau2EubTrPXTMQLjs68jF75KStO42ZIDY pKbuA6L9pzFVIP+YREz+hJhv3sf81Bl2z/OFrLXbWosuPbDOOmzJ1HsKdltjUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZLxk5KZZzB8Q for ; Tue, 09 Jun 2026 08:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45c60 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Jun 2026 08:03:06 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Roman Bogorodskiy Subject: git: d0654a3fb626 - main - x11-wm/obconf: fix crash on theme change List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: novel X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0654a3fb62625e87dae24308ebdfebda6e088a8 Auto-Submitted: auto-generated Date: Tue, 09 Jun 2026 08:03:06 +0000 Message-Id: <6a27c8ba.45c60.70d3f20d@gitrepo.freebsd.org> The branch main has been updated by novel: URL: https://cgit.FreeBSD.org/ports/commit/?id=d0654a3fb62625e87dae24308ebdfebda6e088a8 commit d0654a3fb62625e87dae24308ebdfebda6e088a8 Author: Roman Bogorodskiy AuthorDate: 2026-06-09 07:58:59 +0000 Commit: Roman Bogorodskiy CommitDate: 2026-06-09 08:02:18 +0000 x11-wm/obconf: fix crash on theme change Fix crashing on theme change caused by incorrect error handling. PR: 295921 Reported by: fernape --- 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);