--- libaitrpc/src/cli.c	2010/07/12 08:46:41	1.1.1.1.2.6
+++ 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.6 2010/07/12 08:46:41 misho Exp $
+* $Id: cli.c,v 1.1.1.1.2.8 2011/03/15 16:59:44 misho Exp $
 *
 *************************************************************************/
 #include "global.h"
@@ -280,7 +280,7 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
 		return -1;
 	}
 	if (ret != Limit) {
-		rpc_SetErr(EBADMSG, "Error:: in send RPC request, should be send %d bytes, really is %d\n", 
+		rpc_SetErr(ECANCELED, "Error:: in send RPC request, should be send %d bytes, really is %d\n", 
 				Limit, ret);
 		return -9;
 	}
@@ -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;