--- libaitcfg/src/queue.c	2012/04/04 13:11:49	1.7
+++ libaitcfg/src/queue.c	2012/07/22 21:54:47	1.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: queue.c,v 1.7 2012/04/04 13:11:49 misho Exp $
+* $Id: queue.c,v 1.8 2012/07/22 21:54:47 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -135,7 +135,7 @@ cfg_unsetAttribute(cfg_root_t * __restrict cfg, const 
 	AIT_FREE_VAL(&av->cfg_val);
 	AIT_FREE_VAL(&av->cfg_attr);
 	AIT_FREE_VAL(&av->cfg_sec);
-	free(av);
+	io_free(av);
 	return 1;
 }
 
@@ -161,7 +161,7 @@ cfg_setAttribute(cfg_root_t * __restrict cfg, const ch
 		/* adding new element */
 		section = _selectAttribute(cfg, csSec, NULL);
 
-		av = malloc(sizeof(struct tagCfg));
+		av = io_malloc(sizeof(struct tagCfg));
 		if (!av) {
 			LOGERR;
 			return -1;
@@ -254,7 +254,8 @@ cfg_loadAttribute(cfg_root_t * __restrict cfg, const c
 		if (csDefValue) {
 			AIT_SET_STR(val, csDefValue);
 			ret = AIT_LEN(val);
-		}
+		} else
+			AIT_INIT_VAL(val);
 		return ret;
 	}
 
@@ -263,7 +264,8 @@ cfg_loadAttribute(cfg_root_t * __restrict cfg, const c
 		if (csDefValue) {
 			AIT_SET_STR(val, csDefValue);
 			ret = AIT_LEN(val);
-		}
+		} else
+			AIT_INIT_VAL(val);
 	} else {
 		/* copy value */
 		AIT_SET_STR(val, AIT_GET_STR(&av->cfg_val));