diff options
| author | Alexander Nedotsukov <bland@FreeBSD.org> | 2007-03-25 07:33:11 +0000 |
|---|---|---|
| committer | Alexander Nedotsukov <bland@FreeBSD.org> | 2007-03-25 07:33:11 +0000 |
| commit | c8d5ff0b51667612c99e1b3f67e84091567f6100 (patch) | |
| tree | df8984b96ccf8164adbda78a413bb17a070b0e6d /x11/libxklavier | |
| parent | 2345d03e02066504d44f86fe4171cc32bcf04ef7 (diff) | |
| download | ports-c8d5ff0b51667612c99e1b3f67e84091567f6100.tar.gz ports-c8d5ff0b51667612c99e1b3f67e84091567f6100.zip | |
Properly check for empty xml node set to avoid NULL pointer dereference.
This bug was source of g-s-d crashes on X systems with non standard
keyboard layout options.
Notes
Notes:
svn path=/head/; revision=188242
Diffstat (limited to 'x11/libxklavier')
| -rw-r--r-- | x11/libxklavier/Makefile | 1 | ||||
| -rw-r--r-- | x11/libxklavier/files/patch-libxklavier__xklavier_config.c | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index f1dc3da26728..c5148c319dc7 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -8,6 +8,7 @@ PORTNAME= libxklavier PORTVERSION= 3.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/x11/libxklavier/files/patch-libxklavier__xklavier_config.c b/x11/libxklavier/files/patch-libxklavier__xklavier_config.c new file mode 100644 index 000000000000..8fe5aa1b7a72 --- /dev/null +++ b/x11/libxklavier/files/patch-libxklavier__xklavier_config.c @@ -0,0 +1,11 @@ +--- libxklavier/xklavier_config.c.orig Sun Mar 25 16:03:37 2007 ++++ libxklavier/xklavier_config.c Sun Mar 25 16:25:08 2007 +@@ -280,7 +280,7 @@ + return FALSE; + + nodes = xpath_obj->nodesetval; +- if (nodes != NULL && nodes->nodeTab != NULL) { ++ if (nodes != NULL && nodes->nodeNr) { + rv = xkl_read_config_item(config, *nodes->nodeTab, pitem); + if (pnode != NULL) { + *pnode = *nodes->nodeTab; |