From nobody Sat Apr 29 16:02:11 2023 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 4Q7vPH2tGcz47vvN; Sat, 29 Apr 2023 16:02:11 +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 4Q7vPH2CMWz4SBW; Sat, 29 Apr 2023 16:02:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682784131; 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=TZ7eBsxa8HRcUbP7N5lbTrJc2qCTuxRU7Grv+DTubM8=; b=dX030oSovRK4ulcVIq9MET6J6dWU13fp5BYL/KwhMtj62iIDzg5O1fPalIuvv6Mzgn1Va5 KNwbPei+DiRargdaq9h4YLyI/ulVOx18YJFFjyTOb7atXDPcwlbZcNDrMS/tGZnO2y6RDy lZnl+YtH7z55d2O1JJ1nBMT6yEQ12+AOVfDfkbaEjMWnSLhBykhE9Yijt/JL/Q8Ai6mog/ I2mQK5lloCuvKlxR4/Kno0E9vQTwgm/NUdM+jl0l0Xlgv5eLjBmS4xf5yA1UoMZDyHkGge 7DfDV8Bf+9NT737mRnAWsEIQrRcQMVSUn83Ux/6a2Vu+0LjtjBvyakeMtvy4kA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682784131; 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=TZ7eBsxa8HRcUbP7N5lbTrJc2qCTuxRU7Grv+DTubM8=; b=Iy5oyYVwYqEVA9Uis5tc8dOlFm4KXl3WptiiyVQfThHJUZvNoprDANKvks/zGvWnuGn0gn FpWyFoA6zeZ998YZFnKkEQq3tCnocrYABiXHssf4CxIJJLR3Xrq7g4hsLqFjr2XEyNBaXE VeSS3Z+pJp8vNR601QBsI6bx6T+Y2ZlhYfv0/bKmRfVItZIHG5CInTnq3gEIZmW6iXVjHq 9o/9pwxO75ICBjL4s7TSj01xPz9d5O8qOLS+DfwtxdZXeA+n3x7+oAIpf81k5C1tylwC1Y iAcDzvnVIJzXtBF37ORZERpXo5nrE/YxF3U4d56flD2x+n1aXVKNEkr+Fl37DQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682784131; a=rsa-sha256; cv=none; b=x788ZpaIi2Ws3DjDIpw7OrIMa7LnCqLHk4g+CpOg32YQf81C3IvJ0Q4OZfZrtUOkyn+4r7 B1WEyJ5kZ9fCG4VVApl6pF9dvkRft19XqndTusjW88RdbFRoWsoW6+UWq7NFvRQCcmTcPl hurIg51az+Tc8P/dekYuE9Xxvb8JdNxyaCmPO31vAOEBWLeurmmh+L1FhoXXg5KBdTrcWY l42Ba+gbI3I4hJTsA06wZeO6n/f8o+bjSxO/sLIZ1oCHMHItPVjILaPLEPW7bnJ6yGeL2L uvTns9kbJhtq1F2oDNlsyJY/oRfz7JtGSGP3YNNjGirs7WEUCmdFtEl1btEJIQ== 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 4Q7vPH0xdsznsG; Sat, 29 Apr 2023 16:02:11 +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 33TG2BlM002369; Sat, 29 Apr 2023 16:02:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33TG2BFW002368; Sat, 29 Apr 2023 16:02:11 GMT (envelope-from git) Date: Sat, 29 Apr 2023 16:02:11 GMT Message-Id: <202304291602.33TG2BFW002368@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 4ce9f853281d - main - x11-wm/xfce4-panel: Import upstream commit to fix crash 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 4ce9f853281de004da253d761a4ef81a0b427e7f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ce9f853281de004da253d761a4ef81a0b427e7f commit 4ce9f853281de004da253d761a4ef81a0b427e7f Author: Guido Falsi AuthorDate: 2023-04-29 15:51:00 +0000 Commit: Guido Falsi CommitDate: 2023-04-29 15:51:00 +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 --- 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 +