rpms/libxklavier/devel libxklavier-3.1-crash.patch, NONE, 1.1 libxklavier.spec, 1.27, 1.28

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/libxklavier/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21698

Modified Files:
	libxklavier.spec 
Added Files:
	libxklavier-3.1-crash.patch 
Log Message:
Fix a possible crash


libxklavier-3.1-crash.patch:
 xklavier_config.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libxklavier-3.1-crash.patch ---
--- 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;


Index: libxklavier.spec
===================================================================
RCS file: /cvs/dist/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libxklavier.spec	5 Nov 2006 03:06:10 -0000	1.27
+++ libxklavier.spec	5 Nov 2006 04:01:28 -0000	1.28
@@ -12,6 +12,7 @@
 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 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .crash
 
 %build
 
@@ -67,6 +69,9 @@
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Sat Nov  4 2006 Matthias Clasen <mclasen at redhat.com> - 3.1-2
+- Fix a possible crash (#213419)
+
 * Sat Nov  4 2006 Matthias Clasen <mclasen at redhat.com> - 3.1-1
 - Update to 3.1