From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id kHwhJyJT+2RTawAAG6o9tA:P1 (envelope-from ) for ; Fri, 08 Sep 2023 19:00:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id kHwhJyJT+2RTawAAG6o9tA (envelope-from ) for ; Fri, 08 Sep 2023 19:00:18 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2BAB66D090 for ; Fri, 8 Sep 2023 19:00:18 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b="nT5dxaR/"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1694192418; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=FVwnU04ctNOrE/tohBeB+0f1sXLR7isOIYGCaF89i20=; b=gFiId6FJVyaqGgIDBUNWu1vyclux4409svCNj7C3fIXOS8XjR+PPpBsCd0QDrEZSsrlQW2 olNk4FQ4RQVMuaHh+uOmcEhHyGjvy9N+RGC4z7Xt0Cy9WExiYJy8+C5VUqUUAdVmBKrP5Z 8QWc9Asges3mCFdgrZ3A6HB21jYISfXmPv168prG2jeYLok3xzpLgEi7JlefDASfAAwXt+ 6J0wlwlN/LlKITwSf1RakXlnmE2A8RSZMcpGZGYvrcNz7sLQDXhhOcknYpOWBb8uQ0d28a cvBVTiTqbUl/HF8s3IqhP86O7KgTvoNUnWfwl4PuOCT/OSFeLjKkeu2t8YI/PQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b="nT5dxaR/"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1694192418; a=rsa-sha256; cv=none; b=qjrd3Ivq/A9W6PKLCU4FULnUyx8uOcpc8zicVIV6JVwLEoRt9Qcl/hpX1vAt/aYNzd/phe Ig6nvJMDiohoQFWa0TSsFQcVDWsQKAsLUWEHWFL6Qh5W4zL1svprawXRNfq1B/HUfLQCmp MTYiHpifP1VOHx/3VtJIXJYX9KHNt/4QaT7AATBmclOxHvS9uZP7NW5Db7YVhhi/pYHrVn A5cdHtaQ2mx5fSyStjQeCyZMASrl8bnX8Kkkf1sSOcflc+osBR5F20PdcSvaMJot6Q5dBV FDACSAbSHc9tTJetXpgrKBTdsSns4kyfml9bP2gWeaKlzGLdlLNwjK/vaxvDhw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qeeq0-0003Gl-TL; Fri, 08 Sep 2023 13:00:10 -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 1qeept-0003Bi-Ls for guix-patches@gnu.org; Fri, 08 Sep 2023 13:00:01 -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 1qeept-0008H1-Ck for guix-patches@gnu.org; Fri, 08 Sep 2023 13:00:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qeepv-0002Ki-MS for guix-patches@gnu.org; Fri, 08 Sep 2023 13:00:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65798] [gnome-team v3] Cogl: fix double free Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Sep 2023 17:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vivien Kraus , 65798@debbugs.gnu.org Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com Received: via spool by 65798-submit@debbugs.gnu.org id=B65798.16941923588751 (code B ref 65798); Fri, 08 Sep 2023 17:00:03 +0000 Received: (at 65798) by debbugs.gnu.org; 8 Sep 2023 16:59:18 +0000 Received: from localhost ([127.0.0.1]:45426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeepC-0002H4-37 for submit@debbugs.gnu.org; Fri, 08 Sep 2023 12:59:18 -0400 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:58368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeep8-0002Gp-UO for 65798@debbugs.gnu.org; Fri, 08 Sep 2023 12:59:16 -0400 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-9a64619d8fbso283924066b.0 for <65798@debbugs.gnu.org>; Fri, 08 Sep 2023 09:59:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694192347; x=1694797147; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=FVwnU04ctNOrE/tohBeB+0f1sXLR7isOIYGCaF89i20=; b=nT5dxaR/bJGGA0NQERKhgACK9O1ZOrhjkwyWZbiWTlmeigzZcdsfigSotkoDbkeN8v vIZc4FY4ZQWm/9mmwclamyY+JzSAs7h5el4yPWgAlB6XQVRFNv5cfmKnpQxpw38CbKEu SByXhdEiS8b8JRokSV1WFESRme8Gllj7MqeCxVnjo5aSEM55dkMq8JejpsA5AAHO121D MtOw13QowMkvnvWUhmBQaSUq7A1VfvnPHcvVzhaQb0hwDtXkWxhdXzryfL7MbJti1ySu pnKeFPRB1rA4B+bI8cl5ENRWNmhd7c+iboxCaIhv0jf5QmKSgb1gQur+xml/xeCCHRN5 1Oxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694192347; x=1694797147; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=FVwnU04ctNOrE/tohBeB+0f1sXLR7isOIYGCaF89i20=; b=AfvpfZ0c2Xbd5ZtWgoi9Z1LbIRuaZd/4Ei74tECG/AOJ/uELydy+gqIN1DqaCq6fsU ikepr+QieA4VDxmxE+uPECXnd70MJRwgHzr5Mfd++xpV3oqZdWjsDntCSOGQyz8/ucz4 tq0t3qSFsAY5yLqFKSJPSCX9n6Vxa4mecVN/gb5LZcejxOKuyp7pagUle03ha0Jn1QGl Y127tvdNV6eywAbhUaEUCqR9xCHIjv+6Tw/cg3RZijiGf88XdwhlrOb63BqIKhK3WoV8 CWjWEiW/UBBvN28Y6bvEcLwhgvbGZg4ezl/l8Q1J8gLTJhKK02+PajBCt4INAKiRCfWF X2gQ== X-Gm-Message-State: AOJu0YyaP6oso1WeP3p4W76u8P9vuvjZafXaNibBsd+N1uTU0kOjUOil v4fIDpcYamrIUAcYcBdRGRY= X-Google-Smtp-Source: AGHT+IEB/TNM1dYwZHaywjeFB38WhGH/zV6GwogWmB1DlN/8qpOfQGZ/WIxRxFWmSLFTB84RMEEOKQ== X-Received: by 2002:a17:906:70d6:b0:969:93f2:259a with SMTP id g22-20020a17090670d600b0096993f2259amr2357354ejk.73.1694192346745; Fri, 08 Sep 2023 09:59:06 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id ck8-20020a170906c44800b009a5f1d1564dsm1256040ejb.126.2023.09.08.09.59.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Sep 2023 09:59:05 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Fri, 08 Sep 2023 18:59:05 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 2BAB66D090 X-Migadu-Scanner: mx1.migadu.com X-Migadu-Spam-Score: 7.27 X-Spam-Score: 7.27 X-TUID: k/Bg7p25kzbO Am Donnerstag, dem 07.09.2023 um 07:36 +0200 schrieb Vivien Kraus: > * gnu/packages/patches/cogl-fix-double-free.patch: Avoid freeing the > dispaly used by a cogl context twice. To whom commits this (likely me in the future): s/dispaly/display/ > * gnu/local.mk (dist_patch_DATA): Add cogl-fix-double-free.patch. > * gnu/packages/gnome.scm (cogl): Apply cogl-fix-double-free.patch. > Remove the > comment about the changes to be reflected in mutter, as their bundled > cogl has > diverged far enough. I'll also add a blurb before the ChangeLog and shorten this to make the change clearer. > --- > =C2=A0gnu/local.mk=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2= =A0 1 + > =C2=A0gnu/packages/gnome.scm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 |=C2=A0 6 ++-- > =C2=A0.../patches/cogl-fix-double-free.patch=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 | 32 > +++++++++++++++++++ > =C2=A03 files changed, 36 insertions(+), 3 deletions(-) > =C2=A0create mode 100644 gnu/packages/patches/cogl-fix-double-free.patch >=20 > 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 > =3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0\ > =C2=A0=C2=A0 %D%/packages/patches/clucene-pkgconfig.patch=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0\ > =C2=A0=C2=A0 %D%/packages/patches/cmake-curl-certificates-3.24.patch=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\ > =C2=A0=C2=A0 %D%/packages/patches/coda-use-system-libs.patch=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\ > +=C2=A0 %D%/packages/patches/cogl-fix-double-free.patch=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\ > =C2=A0=C2=A0 %D%/packages/patches/collectd-5.11.0- > noinstallvar.patch=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\ > =C2=A0=C2=A0 %D%/packages/patches/combinatorial-blas-awpm.patch=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\ > =C2=A0=C2=A0 %D%/packages/patches/combinatorial-blas-io-fix.patch=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\ > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > index 922d6ba24b..894aac8202 100644 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -6131,9 +6131,9 @@ (define-public cogl > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (version-major+minor version) "/" > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 "cogl-" version ".tar.xz")) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (sha256 > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (base32 > "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8")))) > -=C2=A0=C2=A0=C2=A0 ;; NOTE: mutter exports a bundled fork of cogl, so wh= en making > changes to > -=C2=A0=C2=A0=C2=A0 ;; cogl, corresponding changes may be appropriate in = mutter as > well. > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (base32 > "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8")) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (patches > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (search-patches "cogl-fix-dou= ble-free.patch")))) > =C2=A0=C2=A0=C2=A0=C2=A0 (build-system gnu-build-system) > =C2=A0=C2=A0=C2=A0=C2=A0 (native-inputs > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 `(("glib:bin" ,glib "bin")=C2=A0=C2=A0=C2= =A0=C2=A0 ; for glib-mkenums > 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..e7a994b33a > --- /dev/null > +++ b/gnu/packages/patches/cogl-fix-double-free.patch > @@ -0,0 +1,32 @@ > +From 15d0f7d96cf53263196e26f2eb48ededdff0efeb Mon Sep 17 00:00:00 > 2001 > +Message-ID: > <15d0f7d96cf53263196e26f2eb48ededdff0efeb.1694148833.git.vivien@plane > te-kraus.eu> > +From: Vivien Kraus > +Date: Thu, 7 Sep 2023 22:16:48 +0200 > +Subject: [PATCH] Prevent double free on context objects > + > +The display is unrefed in the context destructor, but not refed in > the > +constructor. > + > +This targets an archived (read-only) repository. > +--- > + cogl/cogl-context.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/cogl/cogl-context.c b/cogl/cogl-context.c > +index a7eed29a..7cdc9fe7 100644 > +--- a/cogl/cogl-context.c > ++++ b/cogl/cogl-context.c > +@@ -218,7 +218,7 @@ cogl_context_new (CoglDisplay *display, > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return NULL; > +=C2=A0=C2=A0=C2=A0=C2=A0 } > +=20 > +-=C2=A0 context->display =3D display; > ++=C2=A0 context->display =3D cogl_object_ref (display); > +=20 > +=C2=A0=C2=A0 /* This is duplicated data, but it's much more convenient t= o have > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 the driver attached to the context and th= e value is accessed a > + > +base-commit: 61d966c7442d521e38572b7f93ac7b8973a9c65e > +--=20 > +2.41.0 > + >=20 > base-commit: baf5b0745446dabe8166d860996dc54cfa09db3e LGTM, now waiting for CI to build it. Cheers