--- libelwix/src/vars.c	2013/11/14 13:58:12	1.5.4.1
+++ libelwix/src/vars.c	2016/05/18 12:47:42	1.9
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: vars.c,v 1.5.4.1 2013/11/14 13:58:12 misho Exp $
+* $Id: vars.c,v 1.9 2016/05/18 12:47:42 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+Copyright 2004 - 2015
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -417,12 +417,14 @@ ait_freeVars(array_t ** __restrict vars)
 
 	for (i = 0; i < array_Size(*vars); i++)
 		if ((v = array(*vars, i, ait_val_t*))) {
-			AIT_FREE_VAL(v);
 			/* free memory if isn't zero copy */
-			if (!AIT_IN(v) && (*vars)->arr_data[i]) {
-				e_free((*vars)->arr_data[i]);
-				(*vars)->arr_data[i] = NULL;
-			}
+			if (!AIT_IN(v)) {
+				AIT_FREE_VAL(v);
+				if ((*vars)->arr_data[i])
+					e_free((*vars)->arr_data[i]);
+			} else
+				AIT_FREE_VAL(v);
+			(*vars)->arr_data[i] = NULL;
 		}
 	(*vars)->arr_last = -1;
 
@@ -792,23 +794,21 @@ ait_sprintfVar(ait_val_t * __restrict v, const char *f
 {
 	int ret = 0;
 	va_list lst;
-	char *str = NULL;
+	char str[STRSIZ] = { [0 ... STRSIZ - 1] = 0 };
 
 	if (!v || !fmt)
 		return -1;
 
 	va_start(lst, fmt);
-	ret = vasprintf(&str, fmt, lst);
+	ret = vsnprintf(str, sizeof str - 1, fmt, lst);
 	va_end(lst);
 
-	if (str && ret > -1) {
+	if (ret > -1) {
 		AIT_FREE_VAL(v);
 		AIT_SET_STR(v, str);
 	} else
 		LOGERR;
 
-	if (str)
-		free(str);
 	return ret;
 }