XeviGetVisualInfo: check for null pointer before writing to it, not after

1 files changed, 4 insertions, 1 deletions

diff --git a/src/XEVI.c b/src/XEVI.c
index dd796a4..c7cc7f7 100644
--- a/src/XEVI.c
+++ b/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 */