From nobody Sat Apr 29 16:05:41 2023 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 4Q7vTL06tfz47wQ5; Sat, 29 Apr 2023 16:05:42 +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 4Q7vTK6hLMz4TPy; Sat, 29 Apr 2023 16:05:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682784341; 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=UqtkWY4E85RV28pstZadYGqS1avBL+f1iCMCroK1pGU=; b=qxy8cGquyTMR4+AG2PpY6PSJgBkpeZJJMTOHjooGpvJ8yelX9BI4Pn7m4mAC9LK/RbLYpT nZc8NVwyWMDhknJhcQsNysCcgH3vCUJHpKl5WfBAiGVm+Xr3T/3ia1f0FuAA08pnkrzGJY 6v1AXb0ZMKyLDLb15jOFGTsTLGG5M5XiDCRRL+ecHStp7qAuYRdpVVLcZ+8JiTOiSJMCO9 4cK/dgDGhCTqzR6cG/Kt1Ge5thZqM4WEhw2L252PTBmiNJ6KyA+vxCTDjMPgw3HR9hzLkI rLN/0jxGRttwCa4Io+pZvXC34+RHchBYHlyXlR/Ob8E5DHXOZOhdIq7n4wG1jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682784341; 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=UqtkWY4E85RV28pstZadYGqS1avBL+f1iCMCroK1pGU=; b=MPcBGzmuCc1poafmtIOULxVOptX+jFKfGnMpZ2b84z9kAGUC60jfvSs0IaLudRqDbULfY+ BzwnYAcEYbLB3hiRWenCW0T/pCymm5KsWOyWqHVFeubfEfOcxmyQ8tVmoyGn2xbmj96awy bFRQOEVrrO2sBsCCfFm9fKilHREYURvbVTShR1u9DIpnHfCnveH0NDjEQ8+6A1JAOpnlaH ypsHayDI8n7li21fHHHJHkg2EBT8fortZZtowPX2uTmCC/ptyopE6cOM2i9ioUpk/vMRl4 YYLskEHNwcRVTvaQJJLpFWGoR1XxuCsqhXEqrCQ0LHwTJAxSkthKug83YeJmwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682784341; a=rsa-sha256; cv=none; b=WF8geyMKaDU/iHJ2emiTvSUpcMFXfvnEqGocHzzz+9RxHIrOUFX0pgsDbWqI3fZvMTUzvK staNpfQ9kWrxzFbva1CR6Sn3CMrGc3FvExDn0eAWq8F4A6Lwo8tfbrfCX0T9/dCpFkQ8Bz lmwA7iAXV34qPvz5wgkhPO1/cEiQiRoW9A8joqAF6oWdl8fCZuQu492ILqK2v3lbKB/2QC PrE0TVLtd7vnVQUmLE8J4AeuXtD2EOF5LLV+x3LvpT3nQ/6bdO2kleEOo0w7QsmPDvgKxU FyjqtskuevjXRt17g9pieqFYMB5Z0uw+vsxzOw/sLhpdP0x247ZFg6Bk9yh/eg== 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 4Q7vTK5RFwznqL; Sat, 29 Apr 2023 16:05:41 +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 33TG5fBM003992; Sat, 29 Apr 2023 16:05:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33TG5fBH003991; Sat, 29 Apr 2023 16:05:41 GMT (envelope-from git) Date: Sat, 29 Apr 2023 16:05:41 GMT Message-Id: <202304291605.33TG5fBH003991@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Guido Falsi Subject: git: ec695378a8ed - 2023Q2 - x11-wm/xfce4-panel: Import upstream commit to fix crash 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: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: ec695378a8ed5eec410613aa305602ce126e5c15 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=ec695378a8ed5eec410613aa305602ce126e5c15 commit ec695378a8ed5eec410613aa305602ce126e5c15 Author: Guido Falsi AuthorDate: 2023-04-29 15:51:00 +0000 Commit: Guido Falsi CommitDate: 2023-04-29 16:04:40 +0000 x11-wm/xfce4-panel: Import upstream commit to fix crash Reported by: hselasky Obtained from: https://gitlab.xfce.org/xfce/xfce4-panel/-/commit/3bf948cc2618632aaaaabefae1b1be50d5a607c3 (cherry picked from commit 4ce9f853281de004da253d761a4ef81a0b427e7f) --- x11-wm/xfce4-panel/Makefile | 1 + x11-wm/xfce4-panel/files/patch-upstream-crash-fix | 50 +++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile index f7b8c1a2aa52..797080a0eff5 100644 --- a/x11-wm/xfce4-panel/Makefile +++ b/x11-wm/xfce4-panel/Makefile @@ -1,5 +1,6 @@ PORTNAME= xfce4-panel PORTVERSION= 4.18.3 +PORTREVISION= 1 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 diff --git a/x11-wm/xfce4-panel/files/patch-upstream-crash-fix b/x11-wm/xfce4-panel/files/patch-upstream-crash-fix new file mode 100644 index 000000000000..160b26daa431 --- /dev/null +++ b/x11-wm/xfce4-panel/files/patch-upstream-crash-fix @@ -0,0 +1,50 @@ +From 3bf948cc2618632aaaaabefae1b1be50d5a607c3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= +Date: Sun, 16 Apr 2023 17:55:54 +0200 +Subject: [PATCH] tasklist: Fix use-after-free on tasklist child + +This was running smoothly since 2010 but the update to GLib 2.76, which +makes g_slice_free() a simple wrapper around g_free_sized(), revealed +this bug. + +Fixes: #730 +(cherry picked from commit a5a289ede6c2175b97059ead5d63a59dbde04ea0) +--- + plugins/tasklist/tasklist-widget.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/plugins/tasklist/tasklist-widget.c b/plugins/tasklist/tasklist-widget.c +index 24dfdb7db..c0095d70d 100644 +--- plugins/tasklist/tasklist-widget.c ++++ plugins/tasklist/tasklist-widget.c +@@ -1501,6 +1501,15 @@ xfce_tasklist_scroll_event (GtkWidget *widget, + + + ++static gboolean ++xfce_tasklist_free_child (gpointer data) ++{ ++ g_slice_free (XfceTasklistChild, data); ++ return FALSE; ++} ++ ++ ++ + static void + xfce_tasklist_remove (GtkContainer *container, + GtkWidget *widget) +@@ -1528,7 +1537,10 @@ xfce_tasklist_remove (GtkContainer *container, + if (child->pixbuf != NULL) + g_object_unref (child->pixbuf); + +- g_slice_free (XfceTasklistChild, child); ++ /* allow time for signal handlers connected to the destroy/dispose signals of ++ * child members to run, they could refer to these members via child, e.g. ++ * child->button as above to test for equality */ ++ g_idle_add (xfce_tasklist_free_child, child); + + /* queue a resize if needed */ + if (G_LIKELY (was_visible)) +-- +GitLab +