Apply patch from master to fix a crash (rh #865009)

NetworkManager.spec

@@ -19,7 +19,7 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.9.7.0
-Release: 4%{snapshot}%{?dist}
+Release: 5%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -29,6 +29,7 @@ Source1: NetworkManager.conf
 Patch1: explain-dns1-dns2.patch
 Patch2: nss-error.patch
 Patch3: finish-connecting.patch
+Patch4: gvaluearray-crash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): chkconfig
@@ -350,11 +351,14 @@ exit 0
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Mon Oct 15 2012 Dan Winship <danw@redhat.com> - 0.9.7.0-5.git20121004
+- Apply patch from master to fix a crash (rh #865009)
+
 * Sat Oct  6 2012 Dan Winship <danw@redhat.com> - 0.9.7.0-4.git20121004
 - Apply patch from master so connections finish connecting properly (bgo #685581)
 
 * Fri Oct  5 2012 Dan Williams <dcbw@redhat.com> - 0.9.7.0-3.git20121004
-- Forward-port some forgotton fixes from F17
+- Forward-port some forgotten fixes from F17
 - Fix networked-filesystem systemd dependencies (rh #787314)
 - Don't restart NM on upgrade, don't stop NM on uninstall (rh #811200)
 

gvaluearray-crash.patch

@@ -0,0 +1,26 @@
+From b95b6c8aa1b2e2d6a662e93843e50b50d5a9c6c6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
+Date: Thu, 11 Oct 2012 14:56:37 +0200
+Subject: [PATCH] core: fix a crash due to GValueArray/GArray freeing mismatch
+ (rh #865009)
+
+---
+ src/nm-dispatcher.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c
+index 0f17ed9..61dfd7c 100644
+--- a/src/nm-dispatcher.c
++++ b/src/nm-dispatcher.c
+@@ -200,7 +200,7 @@ dispatcher_done_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
+ 			} else
+ 				nm_log_dbg (LOGD_CORE, "Dispatcher result element %d invalid type", i);
+ 
+-			g_array_unref ((GArray *) item);
++			g_value_array_free (item);
+ 		}
+ 		g_ptr_array_free (results, TRUE);
+ 	} else {
+-- 
+1.7.12.1
+