--- libaitio/inc/aitio.h	2012/07/30 09:26:56	1.22.2.3
+++ libaitio/inc/aitio.h	2012/07/30 13:49:04	1.22.2.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.22.2.3 2012/07/30 09:26:56 misho Exp $
+* $Id: aitio.h,v 1.22.2.6 2012/07/30 13:49:04 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -331,7 +331,8 @@ typedef struct {
 						switch (AIT_TYPE(__val)) { \
 							case buffer: \
 							case string: \
-								memset(__val->val.buffer, 0, \
+								if (__val->val.buffer) \
+									memset(__val->val.buffer, 0, \
 										AIT_LEN(__val)); \
 								break; \
 							case data: \
@@ -843,8 +844,8 @@ int io_MakeAV(const char * __restrict csArgs, const ch
  * @psValue = Output Value, if ==NULL this element not present value or not wanted for return
  * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items
 */
-int io_MakeAV2(char ** __restrict psArgs, const char *csDelim, 
-		char * __restrict psAttr, char * __restrict psValue);
+int io_MakeAV2(char * __restrict psArgs, const char *csDelim, 
+		char ** __restrict psAttr, char ** __restrict psValue);
 
 /*
  * io_sarrInit() - Create and initialize dynamic split-order array