--- libaitio/inc/aitio.h	2012/07/30 11:20:07	1.22.2.5
+++ libaitio/inc/aitio.h	2012/07/30 13:54:49	1.22.2.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.22.2.5 2012/07/30 11:20:07 misho Exp $
+* $Id: aitio.h,v 1.22.2.7 2012/07/30 13:54:49 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -331,18 +331,19 @@ 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: \
-								memset(__val->val_data, 0, \
-										AIT_LEN(__val)); \
-								break; \
 							default: \
 								__val->val.net = 0LL; \
 								break; \
 						} \
 						AIT_KEY(__val) = 0; \
+					} while (0)
+#define AIT_ZERO_VAL2(_vl)		do { assert((_vl)); \
+						if (AIT_TYPE((_vl)) == data) \
+							memset((_vl)->val_data, 0, AIT_LEN((_vl))); \
 					} while (0)
 
 struct io_ether_addr {