--- libaitio/inc/aitio.h	2012/07/30 13:54:49	1.22.2.7
+++ libaitio/inc/aitio.h	2012/07/30 14:58:31	1.22.2.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.22.2.7 2012/07/30 13:54:49 misho Exp $
+* $Id: aitio.h,v 1.22.2.8 2012/07/30 14:58:31 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -220,14 +220,21 @@ typedef struct {
 						} } while (0)
 #define AIT_SET_STRCAT(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); \
 						assert(AIT_TYPE(__val) == string); \
+						if (!__val->val.string) \
+							AIT_LEN(__val) = 1; \
 						void *__p = io_realloc(__val->val.string, \
 								AIT_LEN(__val) + strlen((_v))); \
 						if (__p) { \
-							__val->val.string = __p; \
 							AIT_LEN(__val) += strlen((_v)); \
+							if (!__val->val.string) \
+								memset(__p, 0, AIT_LEN(__val)); \
+							__val->val.string = __p; \
 							strlcat((char*) __val->val.string, (_v), \
 									AIT_LEN(__val)); \
-						} } while (0)
+						} else \
+							if (!__val->val.string) \
+								AIT_LEN(__val) = 0; \
+					} while (0)
 #define AIT_SET_STRCPY(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); \
 						assert(AIT_TYPE(__val) == string); \
 						void *__p = io_realloc(__val->val.string, \