--- libaitrpc/src/srv.c	2011/05/02 23:02:44	1.1.1.1.2.25
+++ libaitrpc/src/srv.c	2011/07/14 00:38:50	1.2.2.1
@@ -3,9 +3,46 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.1.1.1.2.25 2011/05/02 23:02:44 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
+terms:
+
+All of the documentation and software included in the ELWIX and AITNET
+Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
+
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+	by Michael Pounov <misho@elwix.org>.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+This product includes software developed by Michael Pounov <misho@elwix.org>
+ELWIX - Embedded LightWeight unIX and its contributors.
+4. Neither the name of AITNET nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
 #include "global.h"
 
 
@@ -30,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);
@@ -86,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;
@@ -94,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) {