Fix a possible crash

This commit is contained in:
Matthias Clasen 2006-11-05 04:01:28 +00:00
parent 50f31aa180
commit 048e1d53a1
2 changed files with 16 additions and 0 deletions

View File

@ -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;

View File

@ -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