From patchwork Thu Sep 7 05:36:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 53623 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1D04527BBE2; Thu, 7 Sep 2023 09:30:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7649927BBE9 for ; Thu, 7 Sep 2023 09:30:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qeAOo-0001zk-5D; Thu, 07 Sep 2023 04:30:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qeAOm-0001z2-NS for guix-patches@gnu.org; Thu, 07 Sep 2023 04:30:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qeAOm-0000Im-Ej for guix-patches@gnu.org; Thu, 07 Sep 2023 04:30:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qeAOn-00084f-U4 for guix-patches@gnu.org; Thu, 07 Sep 2023 04:30:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65798] [PATCH gnome-team] Cogl: fix double free Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Sep 2023 08:30:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65798@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169407539731002 (code B ref -1); Thu, 07 Sep 2023 08:30:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Sep 2023 08:29:57 +0000 Received: from localhost ([127.0.0.1]:38506 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeAOj-00083y-8G for submit@debbugs.gnu.org; Thu, 07 Sep 2023 04:29:57 -0400 Received: from lists.gnu.org ([2001:470:142::17]:42042) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeAOf-00083i-G5 for submit@debbugs.gnu.org; Thu, 07 Sep 2023 04:29:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qeAOX-0001iO-Ux for guix-patches@gnu.org; Thu, 07 Sep 2023 04:29:46 -0400 Received: from planete-kraus.eu ([89.234.140.182]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1qeAOV-0000HE-HF for guix-patches@gnu.org; Thu, 07 Sep 2023 04:29:45 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id d6e91888 for ; Thu, 7 Sep 2023 08:29:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :date:subject:mime-version:content-type :content-transfer-encoding:to:message-id; s=albinoniA; bh=Xy6LoK 8mouZp7SlzFRgcjPcj0cQ=; b=Io8AU56XDB7iNZLTBBa4LzHFPpykWEGjKCMHr7 yAPORMciHQ8vAAD78PGmwZbVYGogVICqNwRBMjHYodRC3VVvmcNcvGf4AZBDkGod wD8wEh3JZjldFyF56EEG+hTCwsYyvcG5HM+996xROYI0s6jN90puuG/ZG2KPd099 HXcuGhgkuNVwC7URIl19lP58Fp12EpJX9SkAuLNbx8/7w7nvMy01McxIW3uEg5uL 3ChGDmci19T3JrgsPQS+5BHMqzjtogu1mwjB7OgR57bn/U6jx9lhP3BSv3OlUdCG gKf5cLrCQ0gp0LKilECGvhL4NT0QxqwsyVfqNQ5ZVJt/mscw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id af13f608 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Thu, 7 Sep 2023 08:29:39 +0000 (UTC) Date: Thu, 7 Sep 2023 07:36:31 +0200 MIME-Version: 1.0 Message-ID: <03afaf481dfe74a9de14c77febf5d9241d0010e7.camel@planete-kraus.eu> User-Agent: Evolution 3.48.4 Received-SPF: pass client-ip=89.234.140.182; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/local.mk (dist_patch_DATA): Add cogl-fix-double-free.patch. * gnu/packages/gnome.scm (cogl): Apply cogl-fix-double-free.patch. * gnu/packages/patches/cogl-fix-double-free.patch: Avoid freeing the dispaly used by a cogl context twice. Since the cogl repository is read-only, this patch won’t be applied upstream. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 4 +++- gnu/packages/patches/cogl-fix-double-free.patch | 12 ++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/cogl-fix-double-free.patch base-commit: baf5b0745446dabe8166d860996dc54cfa09db3e diff --git a/gnu/local.mk b/gnu/local.mk index 24fa8117c6..ae36dd49c9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1024,6 +1024,7 @@ dist_patch_DATA = \ %D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/cmake-curl-certificates-3.24.patch \ %D%/packages/patches/coda-use-system-libs.patch \ + %D%/packages/patches/cogl-fix-double-free.patch \ %D%/packages/patches/collectd-5.11.0-noinstallvar.patch \ %D%/packages/patches/combinatorial-blas-awpm.patch \ %D%/packages/patches/combinatorial-blas-io-fix.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 922d6ba24b..6b824c2832 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6131,7 +6131,9 @@ (define-public cogl (version-major+minor version) "/" "cogl-" version ".tar.xz")) (sha256 - (base32 "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8")))) + (base32 "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8")) + (patches + (search-patches "cogl-fix-double-free.patch")))) ;; NOTE: mutter exports a bundled fork of cogl, so when making changes to ;; cogl, corresponding changes may be appropriate in mutter as well. (build-system gnu-build-system) diff --git a/gnu/packages/patches/cogl-fix-double-free.patch b/gnu/packages/patches/cogl-fix-double-free.patch new file mode 100644 index 0000000000..67391f6300 --- /dev/null +++ b/gnu/packages/patches/cogl-fix-double-free.patch @@ -0,0 +1,12 @@ +diff --git a/cogl-1.22.8/cogl/cogl-context.c b/cogl-1.22.8-fixed/cogl/cogl-context.c +index a7eed29..2280942 100644 +--- a/cogl/cogl-context.c ++++ b/cogl/cogl-context.c +@@ -219,6 +219,7 @@ cogl_context_new (CoglDisplay *display, + } + + context->display = display; ++ cogl_object_ref (display); + + /* This is duplicated data, but it's much more convenient to have + the driver attached to the context and the value is accessed a