r41620 - in /desktop/unstable/gnome-control-center/debian: changelog patches/background-fix-memory-corruption-when-creating-preview.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Mon May  5 09:26:05 2014
New Revision: 41620

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41620
Log:
* Add d/p/background-fix-memory-corruption-when-creating-preview.patch
  - backport upstream commit since it looks like it'll still take
    a while before we can get the new version into unstable.
    (Closes: #742648, #731209, #743220 and a gazillion more duplicates.)

Added:
    desktop/unstable/gnome-control-center/debian/patches/background-fix-memory-corruption-when-creating-preview.patch
Modified:
    desktop/unstable/gnome-control-center/debian/changelog
    desktop/unstable/gnome-control-center/debian/patches/series

Modified: desktop/unstable/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/changelog?rev=41620&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/changelog	[utf-8] Mon May  5 09:26:05 2014
@@ -1,3 +1,12 @@
+gnome-control-center (1:3.8.3-8) UNRELEASED; urgency=medium
+
+  * Add d/p/background-fix-memory-corruption-when-creating-preview.patch
+    - backport upstream commit since it looks like it'll still take
+      a while before we can get the new version into unstable.
+      (Closes: #742648, #731209, #743220 and a gazillion more duplicates.)
+
+ -- Andreas Henriksson <andreas at fatal.se>  Mon, 05 May 2014 11:17:20 +0200
+
 gnome-control-center (1:3.8.3-7) unstable; urgency=medium
 
   * 0001-online-accounts-handle-unbranded-chat-providers.patch:

Added: desktop/unstable/gnome-control-center/debian/patches/background-fix-memory-corruption-when-creating-preview.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/background-fix-memory-corruption-when-creating-preview.patch?rev=41620&op=file
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/background-fix-memory-corruption-when-creating-preview.patch	(added)
+++ desktop/unstable/gnome-control-center/debian/patches/background-fix-memory-corruption-when-creating-preview.patch	[utf-8] Mon May  5 09:26:05 2014
@@ -0,0 +1,38 @@
+From 1097d4ca754ec0a340bc26127808a901e6d78a94 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Mon, 19 Aug 2013 23:40:26 +0200
+Subject: background: Fix memory corruption when creating preview
+
+When using a single screen, the captured area was too small, and
+we were copying data from out-of-bounds of the pixbuf area.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696166
+
+diff --git a/panels/background/cc-background-panel.c b/panels/background/cc-background-panel.c
+index 480cd73..14fa244 100644
+--- a/panels/background/cc-background-panel.c
++++ b/panels/background/cc-background-panel.c
+@@ -256,8 +256,6 @@ on_screenshot_finished (GObject *source,
+   cairo_surface_t *surface;
+   cairo_t *cr;
+   GVariant *result;
+-  int width;
+-  int height;
+ 
+   error = NULL;
+   result = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source),
+@@ -288,10 +286,8 @@ on_screenshot_finished (GObject *source,
+       goto out;
+     }
+ 
+-  width = gdk_pixbuf_get_width (pixbuf);
+-  height = gdk_pixbuf_get_height (pixbuf);
+   surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+-                                        width, height);
++                                        data->monitor_rect.width, data->monitor_rect.height);
+   cr = cairo_create (surface);
+   gdk_cairo_set_source_pixbuf (cr, pixbuf, data->capture_rect.x, data->capture_rect.y);
+   cairo_paint (cr);
+-- 
+cgit v0.10.1
+

Modified: desktop/unstable/gnome-control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/series?rev=41620&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/patches/series	[utf-8] Mon May  5 09:26:05 2014
@@ -4,3 +4,4 @@
 0001-online-accounts-Accept-requests-for-account-creation.patch
 0001-online-accounts-use-the-async-function-to-get-all-th.patch
 0001-online-accounts-handle-unbranded-chat-providers.patch
+background-fix-memory-corruption-when-creating-preview.patch