[lightdm-gtk/f19] avoid crash in gdk_cairo_set_source_pixbuf with bogus geometry values (#915986)

[Rex Dieter]

commit 5ae2cce6a49fddf5d35968a21ac8b9682c726175
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon May 6 07:34:55 2013 -0500

    avoid crash in gdk_cairo_set_source_pixbuf with bogus geometry values (#915986)

 lightdm-gtk-greeter-1.5.1-bg_crash.patch |   12 ++++++++++++
 lightdm-gtk.spec                         |   11 ++++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/lightdm-gtk-greeter-1.5.1-bg_crash.patch b/lightdm-gtk-greeter-1.5.1-bg_crash.patch
new file mode 100644
index 0000000..55cb47d
--- /dev/null
+++ b/lightdm-gtk-greeter-1.5.1-bg_crash.patch
@@ -0,0 +1,12 @@
+diff -up lightdm-gtk-greeter-1.5.1/src/lightdm-gtk-greeter.c.bg_crash lightdm-gtk-greeter-1.5.1/src/lightdm-gtk-greeter.c
+--- lightdm-gtk-greeter-1.5.1/src/lightdm-gtk-greeter.c.bg_crash	2013-02-10 07:48:21.000000000 -0600
++++ lightdm-gtk-greeter-1.5.1/src/lightdm-gtk-greeter.c	2013-05-06 07:32:49.046782264 -0500
+@@ -1015,7 +1015,7 @@ set_background (GdkPixbuf *new_bg)
+         {
+             gdk_screen_get_monitor_geometry (screen, monitor, &monitor_geometry);
+ 
+-            if (bg)
++            if (bg && (monitor_geometry.width > 0) && (monitor_geometry.height > 0))
+             {
+                 GdkPixbuf *p = gdk_pixbuf_scale_simple (bg, monitor_geometry.width,
+                                                         monitor_geometry.height, GDK_INTERP_BILINEAR);
diff --git a/lightdm-gtk.spec b/lightdm-gtk.spec
index 7b2d859..eae24cd 100644
--- a/lightdm-gtk.spec
+++ b/lightdm-gtk.spec
@@ -4,7 +4,7 @@
 Summary:        LightDM GTK+ Greeter
 Name:           lightdm-gtk
 Version:        1.5.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 License:        GPLv3+
 URL:            https://launchpad.net/lightdm-gtk-greeter
@@ -13,6 +13,11 @@ Source0:        https://launchpad.net/lightdm-gtk-greeter/1.6/%{version}/+downlo
 # tweak default config
 Patch1:         lightdm-gtk-greeter-1.5.1-fedora.patch
 
+## upstreamable patches
+# avoid setting background when given bogus screen geometry
+# http://bugzilla.redhat.com/915986
+Patch50:        lightdm-gtk-greeter-1.5.1-bg_crash.patch
+
 BuildRequires:  gettext
 BuildRequires:  intltool
 BuildRequires:  pkgconfig(liblightdm-gobject-1)
@@ -42,6 +47,7 @@ A LightDM greeter that uses the GTK+ toolkit.
 %setup -q -n lightdm-gtk-greeter-%{version}
 
 %patch1 -p1 -b .fedora
+%patch50 -p1 -b .bg_crash
 
 
 %build
@@ -84,6 +90,9 @@ fi
 
 
 %changelog
+* Mon May 06 2013 Rex Dieter <rdieter at fedoraproject.org> 1.5.1-3
+- avoid crash in gdk_cairo_set_source_pixbuf with bogus geometry values (#915986)
+
 * Thu Apr 25 2013 Rex Dieter <rdieter at fedoraproject.org> 1.5.1-2
 - lightdm package should be built with PIE flags (#955147)