[arch-commits] Commit in gnome-shell/repos/extra-x86_64 (2 files)

[Jan de Groot]

    Date: Friday, April 8, 2016 @ 12:36:57
  Author: jgc
Revision: 264203

Fix memleak

Added:
  gnome-shell/repos/extra-x86_64/offscreen-memleak.patch
Modified:
  gnome-shell/repos/extra-x86_64/PKGBUILD

-------------------------+
 PKGBUILD                |   11 ++++++++---
 offscreen-memleak.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-08 10:30:23 UTC (rev 264202)
+++ PKGBUILD	2016-04-08 10:36:57 UTC (rev 264203)
@@ -4,7 +4,7 @@
 
 pkgname=gnome-shell
 pkgver=3.18.4
-pkgrel=1
+pkgrel=2
 pkgdesc="The next generation GNOME Shell"
 arch=(i686 x86_64)
 url="https://wiki.gnome.org/Projects/GnomeShell"
@@ -20,10 +20,12 @@
 groups=(gnome)
 source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
         libsecret-crash.patch
-        nm-libexecdir.patch)
+        nm-libexecdir.patch
+        offscreen-memleak.patch)
 sha256sums=('d959c0aae4c10b194d1fa29e89d34d73a4d35d74f384bf604d78435bf9ced5d7'
             '3c668de4c091dccf3d269b3d549c93f2a9b64e569c87ff3c3466624b5fc735bd'
-            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
+            'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607'
+            'a86cf2d114dfa5a9a6129d7140b7bf98446fb2331e992bea55a30ed70758d15b')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -32,6 +34,9 @@
 
   # FS#30747 FS#32730 Problems due to libexecdir different from NM
   patch -Np1 -i ../nm-libexecdir.patch
+
+  # Fix memleak
+  patch -Np1 -i ../offscreen-memleak.patch
 }
 
 build() {

Added: offscreen-memleak.patch
===================================================================
--- offscreen-memleak.patch	                        (rev 0)
+++ offscreen-memleak.patch	2016-04-08 10:36:57 UTC (rev 264203)
@@ -0,0 +1,30 @@
+From 045e1f01afebb25ee3c5a2332edda9bb34190f3c Mon Sep 17 00:00:00 2001
+From: Aaron Plattner <aplattner at nvidia.com>
+Date: Fri, 18 Mar 2016 16:00:05 -0700
+Subject: st: Fix offscreen leak if cogl_framebuffer_allocate fails
+
+If cogl_framebuffer_allocate fails in _st_create_shadow_pipeline_from_actor, the
+CoglOffscreen* that was allocated earlier in the function is leaked.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=735705
+
+Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
+---
+ src/st/st-private.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/st/st-private.c b/src/st/st-private.c
+index 559336c..d40eceb 100644
+--- a/src/st/st-private.c
++++ b/src/st/st-private.c
+@@ -442,6 +442,7 @@ _st_create_shadow_pipeline_from_actor (StShadow     *shadow_spec,
+       if (!cogl_framebuffer_allocate (fb, &catch_error))
+         {
+           cogl_error_free (catch_error);
++          cogl_object_unref (offscreen);
+           cogl_object_unref (buffer);
+           return NULL;
+         }
+-- 
+cgit v0.12
+