--- libaitio/src/Attic/vars.c	2012/05/18 13:37:48	1.7.2.4
+++ libaitio/src/Attic/vars.c	2012/05/23 11:49:35	1.8.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: vars.c,v 1.7.2.4 2012/05/18 13:37:48 misho Exp $
+* $Id: vars.c,v 1.8.2.2 2012/05/23 11:49:35 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -179,7 +179,7 @@ io_buffer2vars(u_char *buf, int buflen, int vnum, int 
 	/* de-marshaling */
 	for (i = 0; i < io_arraySize(vars); i++) {
 		if (!zcpy) {
-			val = malloc(sizeof(ait_val_t));
+			val = xmalloc(sizeof(ait_val_t));
 			if (!val) {
 				LOGERR;
 				io_arrayFree(vars);
@@ -233,7 +233,7 @@ io_buffer2vars(u_char *buf, int buflen, int vnum, int 
 					Limit += AIT_LEN(val);
 
 				if (!zcpy) {
-					val->val.buffer = malloc(AIT_LEN(val));
+					val->val.buffer = xmalloc(AIT_LEN(val));
 					if (!val->val.buffer) {
 						LOGERR;
 						io_arrayFree(vars);
@@ -393,7 +393,7 @@ io_map2vars(u_char *buf, int buflen, int vnum, int zcp
 	/* de-marshaling */
 	for (i = 0; i < io_arraySize(vars); i++) {
 		if (!zcpy) {
-			val = malloc(sizeof(ait_val_t));
+			val = xmalloc(sizeof(ait_val_t));
 			if (!val) {
 				LOGERR;
 				io_arrayFree(vars);
@@ -438,7 +438,7 @@ io_map2vars(u_char *buf, int buflen, int vnum, int zcp
 					Limit += AIT_LEN(val);
 
 				if (!zcpy) {
-					val->val.buffer = malloc(AIT_LEN(val));
+					val->val.buffer = xmalloc(AIT_LEN(val));
 					if (!val->val.buffer) {
 						LOGERR;
 						io_arrayFree(vars);
@@ -501,23 +501,26 @@ io_allocVars(int varnum)
 inline ait_val_t *
 io_getVars(array_t ** __restrict vars, int n)
 {
+	register int i;
 	ait_val_t *v;
 
 	if (!vars)
 		return NULL;
 
 	if (!*vars) {
-		if (!(*vars = io_arrayInit(n + 1)))
+		if (!(*vars = io_allocVars(n + 1)))
 			return NULL;
 	} else {
-		if (n >= io_arraySize(*vars)) {
+		if (n >= (i = io_arraySize(*vars))) {
 			if (io_arrayGrow(*vars, n + 1, 0))
 				return NULL;
-			if ((v = io_allocVar()))
-				return NULL;
-			else
-				io_arraySet(*vars, n, v);
-			return v;
+			for (; i < io_arraySize(*vars); i++)
+				if (!io_arrayGet(*vars, i)) {
+					if (!(v = io_allocVar()))
+						return NULL;
+					else
+						io_arraySet(*vars, n, v);
+				}
 		}
 	}
 
@@ -573,7 +576,7 @@ io_allocVar(void)
 {
 	ait_val_t *v = NULL;
 
-	v = malloc(sizeof(ait_val_t));
+	v = xmalloc(sizeof(ait_val_t));
 	if (!v) {
 		LOGERR;
 		return NULL;
@@ -595,7 +598,7 @@ io_freeVar(ait_val_t ** __restrict val)
 {
 	if (val && *val) {
 		AIT_FREE_VAL(*val);
-		free(*val);
+		xfree(*val);
 		*val = NULL;
 	}
 }