--- libaitmqtt/src/cliside.c	2012/06/20 15:02:24	1.2
+++ libaitmqtt/src/cliside.c	2012/06/28 11:06:17	1.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cliside.c,v 1.2 2012/06/20 15:02:24 misho Exp $
+* $Id: cliside.c,v 1.3 2012/06/28 11:06:17 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -152,7 +152,8 @@ mqtt_cli_Subscribe(mqtt_cli_t * __restrict cli, mqtt_s
 	if (siz == -1) {
 		LOGERR;
 		return NULL;
-	}
+	} else
+		memset(cli->buf->msg_base, 0, cli->buf->msg_len);
 
 	if ((siz = mqtt_wait4data(cli->sock, cli->timeout, POLLIN | POLLPRI)) == -1) {
 		return NULL;
@@ -204,7 +205,8 @@ mqtt_cli_Unsubscribe(mqtt_cli_t * __restrict cli, mqtt
 	if (siz == -1) {
 		LOGERR;
 		return -1;
-	}
+	} else
+		memset(cli->buf->msg_base, 0, cli->buf->msg_len);
 
 	if ((siz = mqtt_wait4data(cli->sock, cli->timeout, POLLIN | POLLPRI)) == -1) {
 		return -1;
@@ -258,8 +260,10 @@ mqtt_cli_Publish(mqtt_cli_t * __restrict cli, u_short 
 	if (siz == -1) {
 		LOGERR;
 		return -1;
-	} else
+	} else {
 		wlen = siz;
+		memset(cli->buf->msg_base, 0, cli->buf->msg_len);
+	}
 
 	if (QoS == MQTT_QOS_ONCE)	/* no reply */
 		goto end;
@@ -304,7 +308,8 @@ mqtt_cli_Publish(mqtt_cli_t * __restrict cli, u_short 
 		if (siz == -1) {
 			LOGERR;
 			return -1;
-		}
+		} else
+			memset(cli->buf->msg_base, 0, cli->buf->msg_len);
 
 		if ((siz = mqtt_wait4data(cli->sock, cli->timeout, POLLIN | POLLPRI)) == -1) {
 			return -1;
@@ -316,6 +321,12 @@ mqtt_cli_Publish(mqtt_cli_t * __restrict cli, u_short 
 		}
 
 		/* receive PUBCOMP */
+		siz = recv(cli->sock, cli->buf->msg_base, cli->buf->msg_len, 0);
+		if (siz == -1) {
+			LOGERR;
+			return -1;
+		}
+
 		siz = mqtt_readPUBCOMP(cli->buf);
 		if (siz == -1)
 			return -1;