--- libaitio/src/Attic/array.c	2012/07/30 10:55:51	1.10.6.2
+++ libaitio/src/Attic/array.c	2012/07/30 11:20:07	1.10.6.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: array.c,v 1.10.6.2 2012/07/30 10:55:51 misho Exp $
+* $Id: array.c,v 1.10.6.4 2012/07/30 11:20:07 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -582,7 +582,7 @@ io_MakeAV(const char * __restrict csArgs, const char *
 */
 int
 io_MakeAV2(char * __restrict psArgs, const char *csDelim, 
-		char * __restrict psAttr, char * __restrict psValue)
+		char ** __restrict psAttr, char ** __restrict psValue)
 {
 	register int ret = 0;
 	char *pos;
@@ -591,18 +591,20 @@ io_MakeAV2(char * __restrict psArgs, const char *csDel
 		return -1;
 
 	pos = strpbrk(psArgs, csDelim);
-	if (pos)
+	if (pos) {
 		*pos++ = 0;
-	ret++;
-	if (psAttr)
-		psAttr = psArgs;
+		ret++;
+		if (psAttr)
+			*psAttr = psArgs;
+	} else
+		return 0;
 
 	if (psValue) {
 	       	if (pos && *pos) {
 			ret++;
-			psValue = pos;
+			*psValue = pos;
 		} else
-			psValue = NULL;
+			*psValue = NULL;
 	}
 
 	return ret;