rpms/libxklavier/FC-6 libxklavier-3.0-crash.patch, NONE, 1.1 libxklavier.spec, 1.26, 1.27

[fedora-cvs-commits at redhat.com]

Author: mclasen

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

Modified Files:
	libxklavier.spec 
Added Files:
	libxklavier-3.0-crash.patch 
Log Message:
fix a possible crash


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

--- NEW FILE libxklavier-3.0-crash.patch ---
--- libxklavier-3.0/libxklavier/xklavier_config.c.crash	2006-11-04 23:04:26.000000000 -0500
+++ libxklavier-3.0/libxklavier/xklavier_config.c	2006-11-04 23:05:03.000000000 -0500
@@ -261,7 +261,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/FC-6/libxklavier.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libxklavier.spec	30 Aug 2006 17:31:45 -0000	1.26
+++ libxklavier.spec	5 Nov 2006 04:09:59 -0000	1.27
@@ -1,7 +1,7 @@
 Summary:	library providing high-level API for X Keyboard Extension
 Name:		libxklavier
 Version:	3.0
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 Url: http://gswitchit.sourceforge.net/
@@ -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.0-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.0-2
+- Fix a possible crash (#213419)
+
 * Wed Aug 30 2006 Matthias Clasen <mclasen at redhat.com> - 3.0-1.fc6
 - Update to 3.0
 - Require pkgconfig in the -devel package