From 048e1d53a1e0e1bd88ce0ee91897a1afa79b9b59 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Nov 05 2006 04:01:28 +0000
Subject: Fix a possible crash


---

diff --git a/libxklavier-3.1-crash.patch b/libxklavier-3.1-crash.patch
new file mode 100644
index 0000000..f1a1e2f
--- /dev/null
+++ b/libxklavier-3.1-crash.patch
@@ -0,0 +1,11 @@
+--- libxklavier-3.1/libxklavier/xklavier_config.c.crash	2006-11-04 22:56:24.000000000 -0500
++++ libxklavier-3.1/libxklavier/xklavier_config.c	2006-11-04 22:56:54.000000000 -0500
+@@ -280,7 +280,7 @@
+ 		return FALSE;
+ 
+ 	nodes = xpath_obj->nodesetval;
+-	if (nodes != NULL && nodes->nodeTab != NULL) {
++	if (nodes != NULL && nodes->nodeTab != NULL && *nodes->nodeTab != NULL) {
+ 		rv = xkl_read_config_item(config, *nodes->nodeTab, pitem);
+ 		if (pnode != NULL) {
+ 			*pnode = *nodes->nodeTab;
diff --git a/libxklavier.spec b/libxklavier.spec
index ccdade3..1c1e763 100644
--- a/libxklavier.spec
+++ b/libxklavier.spec
@@ -12,6 +12,7 @@ BuildRequires: libX11-devel
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel >= 2.6.0
 Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.gz
+Patch0: libxklavier-3.1-crash.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -31,6 +32,7 @@ Libraries, include files, etc you can use to develop libxklavier applications.
 
 %prep
 %setup -q
+%patch0 -p1 -b .crash
 
 %build
 
@@ -67,6 +69,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Sat Nov  4 2006 Matthias Clasen <mclasen@redhat.com> - 3.1-2
+- Fix a possible crash (#213419)
+
 * Sat Nov  4 2006 Matthias Clasen <mclasen@redhat.com> - 3.1-1
 - Update to 3.1