--- libaitio/inc/aitio.h	2012/07/30 11:20:07	1.22.2.5
+++ 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.5 2012/07/30 11:20:07 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: \