Check to see if array->data is NULL before we dereference it, instead ofXORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1

    after. (Prevents segfault when array->data is initialized to NULL, but
    array->length is not set to 0.)
Always initialize both data & length in ARRAYs.

1 files changed, 6 insertions, 4 deletions

diff --git a/DAofA8.c b/DAofA8.c
index 0e818a3..5ec156f 100644
--- a/DAofA8.c
+++ b/DAofA8.c
@@ -1,4 +1,4 @@
-/*
+/* $Xdotorg: $
  * $Xorg: DAofA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $
  *
  * 
@@ -38,9 +38,11 @@ XdmcpDisposeARRAYofARRAY8 (array)
 {
     int	i;
 
-    for (i = 0; i < (int)array->length; i++)
-	XdmcpDisposeARRAY8 (&array->data[i]);
-    if (array->data != NULL) Xfree (array->data);
+    if (array->data != NULL) {
+	for (i = 0; i < (int)array->length; i++)
+	    XdmcpDisposeARRAY8 (&array->data[i]);
+	Xfree (array->data);
+    }
     array->length = 0;
     array->data = NULL;
 }