--- libaitio/inc/aitio.h	2012/07/31 13:04:39	1.22.2.10
+++ libaitio/inc/aitio.h	2012/07/31 15:02:34	1.22.2.12
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.22.2.10 2012/07/31 13:04:39 misho Exp $
+* $Id: aitio.h,v 1.22.2.12 2012/07/31 15:02:34 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -186,8 +186,8 @@ typedef struct {
 							__val->val_type = data; AIT_LEN(__val) = _len; \
 							if ((_p)) \
 								memcpy(__val->val_data, (_p), _len); \
+							(_vl) = __val; \
 						} \
-						(_vl) = __val; \
 					} while (0);
 #define AIT_SET_PTR(_vl, _p, _len)	do { ait_val_t *__val = (_vl); assert(__val); \
 						__val->val_type = ptr; __val->val.ptr = _p; \
@@ -216,7 +216,8 @@ typedef struct {
 						__val->val_type = string; \
 						if ((_v)) { \
 							__val->val.string = (int8_t*) io_strdup((_v)); \
-							AIT_LEN(__val) = strlen((_v)) + 1; \
+							AIT_LEN(__val) = strlen((const char*) \
+									__val->val.string) + 1; \
 						} else { \
 							__val->val.string = NULL; \
 							AIT_LEN(__val) = 0; \
@@ -253,6 +254,14 @@ typedef struct {
 						if (__p) { \
 							__val->val.string = __p; \
 							AIT_LEN(__val) = strlen((_v)) + 1; \
+							strlcpy((char*) __val->val.string, (_v), \
+									AIT_LEN(__val)); \
+						} } while (0)
+#define AIT_SET_STRLCPY(_vl, _v, _len)	do { ait_val_t *__val = (_vl); assert(__val); \
+						assert(AIT_TYPE(__val) == string); \
+						void *__p = io_realloc(__val->val.string, _len); \
+						if (__p) { \
+							__val->val.string = __p; AIT_LEN(__val) = _len; \
 							strlcpy((char*) __val->val.string, (_v), \
 									AIT_LEN(__val)); \
 						} } while (0)