From ce2bdc02a4e370211e7ec31cb2382f04b144a3ef Mon Sep 17 00:00:00 2001
From: Soren Sandmann Pedersen <ssp@fedoraproject.org>
Date: Aug 31 2007 19:14:39 +0000
Subject: Plug a leak in the slideshow parser


---

diff --git a/gnome-desktop-2.19.90-gnome-bg.patch b/gnome-desktop-2.19.90-gnome-bg.patch
index 6ad3f46..e915d5c 100644
--- a/gnome-desktop-2.19.90-gnome-bg.patch
+++ b/gnome-desktop-2.19.90-gnome-bg.patch
@@ -1,5 +1,5 @@
 --- gnome-desktop-2.19.90/configure.in.gnome-bg	2007-08-13 20:04:02.000000000 -0400
-+++ gnome-desktop-2.19.90/configure.in	2007-08-29 17:17:58.000000000 -0400
++++ gnome-desktop-2.19.90/configure.in	2007-08-29 17:22:58.000000000 -0400
 @@ -51,10 +51,10 @@
  AC_SUBST(GNOME_DISTRIBUTOR)
  AC_SUBST(GNOME_DATE)
@@ -16,8 +16,8 @@
  # As a special favour for vuntz, support --disable-deprecations
  
 --- /dev/null	2007-08-15 18:04:26.337218222 -0400
-+++ gnome-desktop-2.19.90/libgnome-desktop/gnome-bg.c	2007-08-29 17:22:34.000000000 -0400
-@@ -0,0 +1,1836 @@
++++ gnome-desktop-2.19.90/libgnome-desktop/gnome-bg.c	2007-08-31 15:05:05.000000000 -0400
+@@ -0,0 +1,1838 @@
 +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
 +   
 +gnomebg.c: Object for the desktop background.
@@ -1610,8 +1610,10 @@
 +	l2 = parser->stack->head;
 +	
 +	while (l1 && l2) {
-+		if (strcmp (l1->data, l2->data) != 0)
++		if (strcmp (l1->data, l2->data) != 0) {
++			g_list_free (stack);
 +			return FALSE;
++		}
 +		
 +		l1 = l1->next;
 +		l2 = l2->next;
@@ -1855,7 +1857,7 @@
 +	return FALSE;
 +}
 --- gnome-desktop-2.19.90/libgnome-desktop/Makefile.am.gnome-bg	2007-08-13 20:04:00.000000000 -0400
-+++ gnome-desktop-2.19.90/libgnome-desktop/Makefile.am	2007-08-29 17:17:58.000000000 -0400
++++ gnome-desktop-2.19.90/libgnome-desktop/Makefile.am	2007-08-29 17:22:58.000000000 -0400
 @@ -18,7 +18,8 @@
  libgnome_desktop_2_la_SOURCES = \
  	gnome-desktop-item.c	\
@@ -1867,7 +1869,7 @@
  libgnome_desktop_2_la_LIBADD = \
  	$(GNOME_DESKTOP_LIBS)
 --- gnome-desktop-2.19.90/libgnome-desktop/libgnomeui/Makefile.am.gnome-bg	2007-08-13 20:04:00.000000000 -0400
-+++ gnome-desktop-2.19.90/libgnome-desktop/libgnomeui/Makefile.am	2007-08-29 17:17:58.000000000 -0400
++++ gnome-desktop-2.19.90/libgnome-desktop/libgnomeui/Makefile.am	2007-08-29 17:22:58.000000000 -0400
 @@ -1,4 +1,5 @@
  libgnomeui_desktopdir = $(includedir)/gnome-desktop-2.0/libgnomeui
  libgnomeui_desktop_HEADERS = \
@@ -1876,7 +1878,7 @@
 +	gnome-hint.h       \
 +	gnome-bg.h
 --- /dev/null	2007-08-15 18:04:26.337218222 -0400
-+++ gnome-desktop-2.19.90/libgnome-desktop/libgnomeui/gnome-bg.h	2007-08-29 17:17:58.000000000 -0400
++++ gnome-desktop-2.19.90/libgnome-desktop/libgnomeui/gnome-bg.h	2007-08-29 17:22:58.000000000 -0400
 @@ -0,0 +1,99 @@
 +/* gnome-bg.h - 
 +
diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 0d77fb4..ec086d1 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.19.90
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.19/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Fri Aug 31 2007 Soren Sandmann <sandmann@redhat.com> - 2.19.90-7
+- Plug a leak in the slideshow parser
+
 * Wed Aug 29 2007 Soren Sandmann <sandmann@redhat.com> - 2.19.90-6
 - Delete cache on URI switch. Various cleanups.