--- libaitio/inc/aitio.h	2012/07/31 15:19:11	1.22.2.13
+++ libaitio/inc/aitio.h	2012/07/31 15:58:08	1.22.2.14
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.22.2.13 2012/07/31 15:19:11 misho Exp $
+* $Id: aitio.h,v 1.22.2.14 2012/07/31 15:58:08 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -180,12 +180,12 @@ typedef struct {
 #define AIT_GET_F32(_vl)		(assert(AIT_TYPE((_vl)) == f32), (_vl)->val.f32)
 #define AIT_GET_F64(_vl)		(assert(AIT_TYPE((_vl)) == f64), (_vl)->val.f64)
 
-#define AIT_SET_DATA(_vl, _p, _len)	do { ait_val_t *__val = (_vl); \
-						__val = io_realloc(__val, sizeof(ait_val_t) + _len); \
+#define AIT_SET_DATA(_vl, _p, _len)	do { ait_val_t *__val = io_realloc((_vl), (sizeof(ait_val_t) + _len)); \
 						if (__val) { \
 							__val->val_type = data; AIT_LEN(__val) = _len; \
-							if ((_p)) \
+							if ((_p)) { \
 								memcpy(__val->val_data, (_p), _len); \
+							} \
 							(_vl) = __val; \
 						} \
 					} while (0);