bug#65798: closed ([PATCH gnome-team] Cogl: fix double free)

[GNU bug Tracking System]

Your message dated Fri, 15 Sep 2023 18:17:47 +0200
with message-id <ef12ccfc13a8a3133802030436b69425e5587854.camel@gmail.com>
and subject line Re: [gnome-team v3] Cogl: fix double free
has caused the debbugs.gnu.org bug report #65798,
regarding [PATCH gnome-team] Cogl: fix double free
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
65798: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=65798
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH gnome-team] Cogl: fix double free
>
>
>
>
> Date: 
>
> Thu, 7 Sep 2023 07:36:31 +0200
>
>
>
>
> User-agent: 
>
> Evolution 3.48.4 
>
>
>
>
> * 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
>
> 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
>
> base-commit: baf5b0745446dabe8166d860996dc54cfa09db3e
> -- 
> 2.41.0
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [gnome-team v3] Cogl: fix double free
>
>
>
>
> Date: 
>
> Fri, 15 Sep 2023 18:17:47 +0200
>
>
>
>
> User-agent: 
>
> Evolution 3.46.4 
>
>
>
>
> Am Freitag, dem 08.09.2023 um 18:59 +0200 schrieb Liliana Marie
> Prikler:
> > LGTM, now waiting for CI to build it.
> QA green, it's merge time.
>
> Thanks
>
>
> --- End Message ---