From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: Vivien Kraus <vivien@planete-kraus.eu>, 65798@debbugs.gnu.org
Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com
Subject: [bug#65798] [gnome-team v3] Cogl: fix double free
Date: Fri, 08 Sep 2023 18:59:05 +0200 [thread overview]
Message-ID: <b0055d7805af932b5076b244cf205c0d2bd303bf.camel@gmail.com> (raw)
In-Reply-To: <e79232881a6dcc573a730ff8b66baddb6891ea1c.1694149645.git.vivien@planete-kraus.eu>
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.
> ---
> gnu/local.mk | 1 +
> gnu/packages/gnome.scm | 6 ++--
> .../patches/cogl-fix-double-free.patch | 32
> +++++++++++++++++++
> 3 files changed, 36 insertions(+), 3 deletions(-)
> create mode 100644 gnu/packages/patches/cogl-fix-double-free.patch
>
> 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..894aac8202 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -6131,9 +6131,9 @@ (define-public cogl
> (version-major+minor version) "/"
> "cogl-" version ".tar.xz"))
> (sha256
> - (base32
> "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8"))))
> - ;; NOTE: mutter exports a bundled fork of cogl, so when making
> changes to
> - ;; cogl, corresponding changes may be appropriate in mutter as
> well.
> + (base32
> "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8"))
> + (patches
> + (search-patches "cogl-fix-double-free.patch"))))
> (build-system gnu-build-system)
> (native-inputs
> `(("glib:bin" ,glib "bin") ; 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 <vivien@planete-kraus.eu>
> +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,
> + return NULL;
> + }
> +
> +- context->display = display;
> ++ context->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
> +
> +base-commit: 61d966c7442d521e38572b7f93ac7b8973a9c65e
> +--
> +2.41.0
> +
>
> base-commit: baf5b0745446dabe8166d860996dc54cfa09db3e
LGTM, now waiting for CI to build it.
Cheers
next prev parent reply other threads:[~2023-09-08 17:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-07 5:36 [bug#65798] [PATCH gnome-team] Cogl: fix double free Vivien Kraus via Guix-patches via
2023-09-07 5:36 ` [bug#65798] [PATCH gnome-team v2] " Vivien Kraus via Guix-patches via
2023-09-08 4:24 ` Liliana Marie Prikler
2023-09-07 5:36 ` [bug#65798] [gnome-team v3] " Vivien Kraus via Guix-patches via
2023-09-08 16:59 ` Liliana Marie Prikler [this message]
2023-09-15 16:17 ` bug#65798: " Liliana Marie Prikler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b0055d7805af932b5076b244cf205c0d2bd303bf.camel@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=65798@debbugs.gnu.org \
--cc=maxim.cournoyer@gmail.com \
--cc=rg@raghavgururajan.name \
--cc=vivien@planete-kraus.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.