--- libaitmqtt/src/conn.c	2012/06/20 08:55:50	1.1.1.1.2.3
+++ libaitmqtt/src/conn.c	2012/06/20 15:02:24	1.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: conn.c,v 1.1.1.1.2.3 2012/06/20 08:55:50 misho Exp $
+* $Id: conn.c,v 1.2 2012/06/20 15:02:24 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -67,7 +67,8 @@ mqtt_msgCONNECT(mqtt_msg_t * __restrict buf, const cha
 		const char *csWillTopic, const char *csWillMessage, 
 		u_char ClrSess, u_char WillQOS, u_char WillRetain)
 {
-	int n, len, siz = 0;
+	int len, siz = 0;
+	u_int n;
 	struct mqtthdr *hdr;
 	mqtthdr_var_t *var, *cid, *topic, *wmsg, *user, *pass;
 	mqtthdr_protover_t *proto;
@@ -77,8 +78,6 @@ mqtt_msgCONNECT(mqtt_msg_t * __restrict buf, const cha
 
 	if (!buf || !csConnID)
 		return -1;
-	else
-		data = buf->msg_base;
 	if (strlen(csConnID) > 23) {
 		mqtt_SetErr(EINVAL, "Invalid argument ConnID is too long (max 23 bytes)");
 		return -1;
@@ -106,7 +105,7 @@ mqtt_msgCONNECT(mqtt_msg_t * __restrict buf, const cha
 	}
 	if (csWillTopic && *csWillTopic) {		/* will messages */
 		len += sizeof(mqtt_len_t) + strlen(csWillTopic);
-		len += sizeof(mqtt_len_t) + strlen(csWillMessage);
+		len += sizeof(mqtt_len_t) + (csWillMessage ? strlen(csWillMessage) : 0);
 	}
 
 	/* calculate header size */
@@ -116,8 +115,10 @@ mqtt_msgCONNECT(mqtt_msg_t * __restrict buf, const cha
 
 	if (mqtt_msgRealloc(buf, siz + len) == -1)
 		return -1;
-	else
+	else {
+		data = buf->msg_base;
 		hdr = (struct mqtthdr *) data;
+	}
 
 	/* fixed header */
 	MQTTHDR_MSGINIT(hdr);