--- libaitrpc/src/srv.c	2011/05/02 23:12:08	1.2
+++ libaitrpc/src/srv.c	2011/07/14 00:38:50	1.2.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.2 2011/05/02 23:12:08 misho Exp $
+* $Id: srv.c,v 1.2.2.1 2011/07/14 00:38:50 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -67,6 +67,7 @@ rpc_srv_dispatchCall(void *arg)
 		s = c->cli_parent;
 
 	do {
+		v = NULL;
 		FD_ZERO(&fds);
 		FD_SET(c->cli_sock, &fds);
 		ret = select(c->cli_sock + 1, &fds, NULL, NULL, NULL);
@@ -123,7 +124,7 @@ rpc_srv_dispatchCall(void *arg)
 					       	data += v[i].val_len;
 						break;
 					case string:
-						if (v[i].val_len + 1 > BUFSIZ - Limit) {
+						if (v[i].val_len > BUFSIZ - Limit) {
 							rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n");
 							ret = -5;
 							goto makeReply;
@@ -131,7 +132,7 @@ rpc_srv_dispatchCall(void *arg)
 							Limit += v[i].val_len;
 
 						v[i].val.string = (int8_t*) data;
-						data += v[i].val_len + 1;
+						data += v[i].val_len;
 						break;
 					case blob:
 						if (s->srv_blob.state == disable) {