--- libaitrpc/src/blob.c	2013/05/26 20:24:52	1.12.2.1
+++ libaitrpc/src/blob.c	2013/07/15 13:32:15	1.13.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: blob.c,v 1.12.2.1 2013/05/26 20:24:52 misho Exp $
+* $Id: blob.c,v 1.13.2.1 2013/07/15 13:32:15 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -330,12 +330,15 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t
 	}
 
 	if (hdr.hdr_cmd != error) {
+		AIT_SET_BLOB(var, ntohl(hdr.hdr_var), ntohl(hdr.hdr_len));
+
 		if (ntohl(hdr.hdr_len) != AIT_LEN(var)) {
+			rpc_cli_delBLOB(cli, var);
+			AIT_NEW_BLOB(var, ntohl(hdr.hdr_len));
+
 			rpc_SetErr(ECANCELED, "Bad return length packet");
 			return 1;
 		}
-
-		AIT_SET_BLOB(var, ntohl(hdr.hdr_var), ntohl(hdr.hdr_len));
 	}
 
 	return hdr.hdr_cmd == error;