Fixes from GIT:

- XeviGetVisualInfo: check for null pointer before writing to it, not after
- Coverity #467: security_error_list has fewer than XSecurityNumberErrors
  entries

- Fix misc. warnings.

Bump rev.

8 files changed, 130 insertions, 2 deletions

diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index 5bfa626e89d..2810fad3bab 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/07/03 13:35:49 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/01/29 02:00:21 bjs Exp $
 #
 
 DISTNAME=		libXext-1.0.3
+PKGREVISION=		1
 CATEGORIES=		x11 devel
 MASTER_SITES=		http://xorg.freedesktop.org/releases/individual/lib/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libXext/distinfo b/x11/libXext/distinfo
index c7878504816..0662924d2cf 100644
--- a/x11/libXext/distinfo
+++ b/x11/libXext/distinfo
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.2 2007/02/26 14:58:18 joerg Exp $
+$NetBSD: distinfo,v 1.3 2008/01/29 02:00:21 bjs Exp $
 
 SHA1 (libXext-1.0.3.tar.bz2) = 341796c502d0076912b090f0ac6a764501800684
 RMD160 (libXext-1.0.3.tar.bz2) = 375041cf7b89d2130a38200122ab3f27ef3ca5fd
 Size (libXext-1.0.3.tar.bz2) = 262116 bytes
+SHA1 (patch-aa) = 3d8b3a3236a7b23d91c541bb2da5fac28a34ecfa
+SHA1 (patch-ab) = e48c5005eeaff5d6664c47f9d80339bfd965356a
+SHA1 (patch-ac) = 23374cc6243334f360c265ca7abe83ae2e6d1a81
+SHA1 (patch-ad) = d9e670932c4ddcbb3cac5c9d32df9627473259ca
+SHA1 (patch-ae) = 801927abe502d3c6e250d1edd8805f27d55dedad
+SHA1 (patch-af) = 8f970ba7e514c7a9a824f32824c9c2a6f0d61b8d
diff --git a/x11/libXext/patches/patch-aa b/x11/libXext/patches/patch-aa
new file mode 100644
index 00000000000..da4d429f697
--- /dev/null
+++ b/x11/libXext/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2008/01/29 02:00:22 bjs Exp $
+
+XeviGetVisualInfo: check for null pointer before writing to it, not after
+
+--- src/XEVI.c.orig	2006-07-11 14:05:14.000000000 -0400
++++ src/XEVI.c
+@@ -117,10 +117,13 @@ Status XeviGetVisualInfo(
+     register int n_data, visualIndex, vinfoIndex;
+     Bool isValid;
+     XeviCheckExtension (dpy, info, 0);
++    if (!n_info_return || !evi_return) {
++	return BadValue;
++    }
+     *n_info_return = 0;
+     *evi_return = NULL;
+     vinfo = XGetVisualInfo(dpy, 0, NULL, &sz_info);
+-    if (!vinfo || !evi_return) {
++    if (!vinfo) {
+ 	return BadValue;
+     }
+     if (!n_visual || !visual) {		/* copy the all visual */
diff --git a/x11/libXext/patches/patch-ab b/x11/libXext/patches/patch-ab
new file mode 100644
index 00000000000..8b8ee5294f6
--- /dev/null
+++ b/x11/libXext/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2008/01/29 02:00:22 bjs Exp $
+
+Coverity #467: security_error_list has fewer than 
+XSecurityNumberErrors entries
+
+--- src/XSecurity.c.orig	2006-07-11 14:05:14.000000000 -0400
++++ src/XSecurity.c
+@@ -78,7 +78,7 @@ static XExtensionHooks Security_extensio
+ };
+ 
+ static char    *security_error_list[] = {
+-    "BadAuthorization"
++    "BadAuthorization",
+     "BadAuthorizationProtocol"
+ };
+ 
diff --git a/x11/libXext/patches/patch-ac b/x11/libXext/patches/patch-ac
new file mode 100644
index 00000000000..93de75f0cf3
--- /dev/null
+++ b/x11/libXext/patches/patch-ac
@@ -0,0 +1,24 @@
+$NetBSD: patch-ac,v 1.1 2008/01/29 02:00:22 bjs Exp $
+
+Fix warnings.
+
+--- src/XShape.c.orig	2006-07-11 14:05:14.000000000 -0400
++++ src/XShape.c
+@@ -461,7 +461,7 @@ XRectangle *XShapeGetRectangles (
+     }
+     *count = rep.nrects;
+     *ordering = rep.ordering;
+-    rects = 0;
++    rects = NULL;
+     if (*count) {
+ 	xrects = (xRectangle *) Xmalloc (*count * sizeof (xRectangle));
+ 	rects = (XRectangle *) Xmalloc (*count * sizeof (XRectangle));
+@@ -471,7 +471,7 @@ XRectangle *XShapeGetRectangles (
+ 	    if (rects)
+ 		Xfree (rects);
+ 	    _XEatData (dpy, *count * sizeof (xRectangle));
+-	    rects = 0;
++	    rects = NULL;
+ 	    *count = 0;
+ 	} else {
+ 	    _XRead (dpy, (char *) xrects, *count * sizeof (xRectangle));
diff --git a/x11/libXext/patches/patch-ad b/x11/libXext/patches/patch-ad
new file mode 100644
index 00000000000..1fdb8ea2cad
--- /dev/null
+++ b/x11/libXext/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2008/01/29 02:00:22 bjs Exp $
+
+Fix warnings.
+
+--- src/XTestExt1.c.orig	2006-07-11 14:05:14.000000000 -0400
++++ src/XTestExt1.c
+@@ -1200,7 +1200,7 @@ int	ack_flag)
+ 	/*
+ 	 * points to XTestIdentifyMyEvent
+ 	 */
+-	Bool	(*func_ptr)();
++	Bool	(*func_ptr)(Display *, XEvent *, XPointer);
+ 
+ 	/*
+ 	 * write the input actions to the server
diff --git a/x11/libXext/patches/patch-ae b/x11/libXext/patches/patch-ae
new file mode 100644
index 00000000000..f10e5d302a8
--- /dev/null
+++ b/x11/libXext/patches/patch-ae
@@ -0,0 +1,30 @@
+$NetBSD: patch-ae,v 1.1 2008/01/29 02:00:22 bjs Exp $
+
+Fix warnings.
+
+--- src/extutil.c.orig	2006-07-11 14:05:14.000000000 -0400
++++ src/extutil.c
+@@ -248,11 +248,11 @@ static int _default_exterror (Display *d
+  * requested extension is referenced.  This should eventually move into Xlib.
+  */
+ 
+-extern int (*_XExtensionErrorFunction)();
++extern int (*_XExtensionErrorFunction)(Display*, char *, char * );
+ 
+-int (*XSetExtensionErrorHandler(int (*handler)(Display*, char *, char * )))()
++int (*XSetExtensionErrorHandler(int (*handler)(Display*, char *, char * )))(Display*, char *, char * )
+ {
+-    int (*oldhandler)() = _XExtensionErrorFunction;
++    int (*oldhandler)(Display*, char *, char * ) = _XExtensionErrorFunction;
+ 
+     _XExtensionErrorFunction = (handler ? handler :
+ 				_default_exterror);
+@@ -265,7 +265,7 @@ int (*XSetExtensionErrorHandler(int (*ha
+  */
+ int XMissingExtension (Display *dpy, _Xconst char *ext_name)
+ {
+-    int (*func)() = (_XExtensionErrorFunction ?
++    int (*func)(Display*, char *, char *) = (_XExtensionErrorFunction ?
+ 		     _XExtensionErrorFunction : _default_exterror);
+ 
+     if (!ext_name) ext_name = X_EXTENSION_UNKNOWN;
diff --git a/x11/libXext/patches/patch-af b/x11/libXext/patches/patch-af
new file mode 100644
index 00000000000..2fa5b58cc03
--- /dev/null
+++ b/x11/libXext/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1 2008/01/29 02:00:22 bjs Exp $
+
+Fix warnings.
+
+--- src/globals.c.orig	2006-07-11 14:05:14.000000000 -0400
++++ src/globals.c
+@@ -75,7 +75,7 @@ from The Open Group.
+ /*
+  * Error handlers; used to be in XlibInt.c
+  */
+-typedef int (*funcptr)();
++typedef int (*funcptr)(Display*, char *, char *);
+ ZEROINIT (funcptr, _XExtensionErrorFunction, NULL);
+ 
+ /*