--- libaitrpc/src/cli.c	2011/03/15 15:13:22	1.1.1.1.2.7
+++ libaitrpc/src/cli.c	2011/03/15 16:59:44	1.1.1.1.2.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.1.1.1.2.7 2011/03/15 15:13:22 misho Exp $
+* $Id: cli.c,v 1.1.1.1.2.8 2011/03/15 16:59:44 misho Exp $
 *
 *************************************************************************/
 #include "global.h"
@@ -373,6 +373,9 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
 						*out_vals = NULL;
 						*out_argc = 0;
 						return -1;
+					} else {
+						/* sanity check ... preserve null byte */
+						(*out_vals)[i].val.string[(*out_vals)[i].val_len] = 0;
 					}
 				       	data += (*out_vals)[i].val_len + 1;
 					break;