diff options
| author | bland <bland@FreeBSD.org> | 2007-03-25 15:33:11 +0800 |
|---|---|---|
| committer | bland <bland@FreeBSD.org> | 2007-03-25 15:33:11 +0800 |
| commit | 360a60cc4d00a82cb50bd870c4f1e83bab305fe3 (patch) | |
| tree | 77bccd873ce2c19fd63c3ebdf208821ecf58517c /x11 | |
| parent | 725675bce1b669c3a504374e53dd7d168d959ba2 (diff) | |
| download | freebsd-ports-gnome-360a60cc4d00a82cb50bd870c4f1e83bab305fe3.tar.gz freebsd-ports-gnome-360a60cc4d00a82cb50bd870c4f1e83bab305fe3.tar.zst freebsd-ports-gnome-360a60cc4d00a82cb50bd870c4f1e83bab305fe3.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.
Diffstat (limited to 'x11')
| -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; |