--- libaitmqtt/src/sub.c	2012/04/07 20:54:57	1.1.1.1.2.1
+++ libaitmqtt/src/sub.c	2012/04/27 15:15:12	1.1.1.1.2.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: sub.c,v 1.1.1.1.2.1 2012/04/07 20:54:57 misho Exp $
+* $Id: sub.c,v 1.1.1.1.2.5 2012/04/27 15:15:12 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -109,7 +109,6 @@ mqtt_msgSUBSCRIBE(mqtt_msg_t * __restrict buf, mqtt_su
 	hdr->mqtt_msg.retain = 0;
 	*hdr->mqtt_len = mqtt_encodeLen(siz - sizeof(struct mqtthdr));
 
-	mqtt_msgRealloc(buf, siz);
 	return siz;
 }
 
@@ -157,7 +156,6 @@ mqtt_msgSUBACK(mqtt_msg_t * __restrict buf, mqtt_subsc
 	hdr->mqtt_msg.type = MQTT_TYPE_SUBACK;
 	*hdr->mqtt_len = mqtt_encodeLen(siz - sizeof(struct mqtthdr));
 
-	mqtt_msgRealloc(buf, siz);
 	return siz;
 }
 
@@ -220,7 +218,6 @@ mqtt_msgUNSUBSCRIBE(mqtt_msg_t * __restrict buf, mqtt_
 	hdr->mqtt_msg.retain = 0;
 	*hdr->mqtt_len = mqtt_encodeLen(siz - sizeof(struct mqtthdr));
 
-	mqtt_msgRealloc(buf, siz);
 	return siz;
 }
 
@@ -270,9 +267,9 @@ mqtt_msgUNSUBACK(mqtt_msg_t * __restrict buf, u_short 
  * @buf = Message buffer
  * @msgID = MessageID
  * @subscr = Subscriptions, must be free after use with mqtt_subFree()
- * return: NULL error or !=NULL MQTT fixed header
+ * return: -1 error or >-1 elements into subscr
  */
-struct mqtthdr *
+int
 mqtt_readSUBSCRIBE(mqtt_msg_t * __restrict buf, u_short *msgID, mqtt_subscr_t **subscr)
 {
 	register int i;
@@ -284,11 +281,11 @@ mqtt_readSUBSCRIBE(mqtt_msg_t * __restrict buf, u_shor
 	caddr_t pos;
 
 	if (!buf || !msgID || !subscr)
-		return NULL;
+		return -1;
 
 	hdr = _mqtt_readHEADER(buf, MQTT_TYPE_SUBSCRIBE, &ret, &len);
 	if (!hdr)
-		return NULL;
+		return -1;
 	pos = buf->msg_base + ret + 1;
 	v = (mqtt_len_t*) pos;
 
@@ -296,7 +293,7 @@ mqtt_readSUBSCRIBE(mqtt_msg_t * __restrict buf, u_shor
 	len -= sizeof(mqtt_len_t);
 	if (len < 0) {
 		mqtt_SetErr(EINVAL, "Short message length %d", len);
-		return NULL;
+		return -1;
 	} else {
 		*msgID = ntohs(v->val);
 		pos += sizeof(mqtt_len_t);
@@ -304,7 +301,7 @@ mqtt_readSUBSCRIBE(mqtt_msg_t * __restrict buf, u_shor
 
 	subs = mqtt_subAlloc(0);
 	if (!subs)
-		return NULL;
+		return -1;
 	else
 		*subscr = subs;
 
@@ -315,31 +312,32 @@ mqtt_readSUBSCRIBE(mqtt_msg_t * __restrict buf, u_shor
 		if (len < 0) {
 			mqtt_subFree(subscr);
 			mqtt_SetErr(EINVAL, "Short message length %d", len);
-			return NULL;
+			return -1;
 		}
-		subs = mqtt_subRealloc(subs, i + 1);
-		if (!subs) {
+		if (!mqtt_subRealloc(&subs, i + 1)) {
 			mqtt_subFree(subscr);
-			return NULL;
+			return -1;
 		} else
 			*subscr = subs;
 
 		memset(&subs[i], 0, sizeof subs[i]);
 		subs[i].sub_topic.msg_len = ntohs(var->var_sb.val);
-		subs[i].sub_topic.msg_base = malloc(subs[i].sub_topic.msg_len);
+		subs[i].sub_topic.msg_base = malloc(subs[i].sub_topic.msg_len + 1);
 		if (!subs[i].sub_topic.msg_base) {
 			LOGERR;
 			mqtt_subFree(subscr);
-			return NULL;
-		} else
+			return -1;
+		} else {
 			memcpy(subs[i].sub_topic.msg_base, var->var_data, subs[i].sub_topic.msg_len);
+			((char*) subs[i].sub_topic.msg_base)[subs[i].sub_topic.msg_len] = 0;
+		}
 		pos += MQTTHDR_VAR_SIZEOF(var);
 
 		subs[i].sub_ret = *pos;
 		pos++;
 	}
 
-	return hdr;
+	return i;
 }
 
 /*
@@ -394,9 +392,9 @@ mqtt_readSUBACK(mqtt_msg_t * __restrict buf, u_short *
  * @buf = Message buffer
  * @msgID = MessageID
  * @subscr = Subscriptions, must be free after use with mqtt_subFree()
- * return: NULL error or !=NULL MQTT fixed header
+ * return: -1 error or >-1 elements into subscr
  */
-struct mqtthdr *
+int
 mqtt_readUNSUBSCRIBE(mqtt_msg_t * __restrict buf, u_short *msgID, mqtt_subscr_t **subscr)
 {
 	register int i;
@@ -408,11 +406,11 @@ mqtt_readUNSUBSCRIBE(mqtt_msg_t * __restrict buf, u_sh
 	caddr_t pos;
 
 	if (!buf || !msgID || !subscr)
-		return NULL;
+		return -1;
 
 	hdr = _mqtt_readHEADER(buf, MQTT_TYPE_UNSUBSCRIBE, &ret, &len);
 	if (!hdr)
-		return NULL;
+		return -1;
 	pos = buf->msg_base + ret + 1;
 	v = (mqtt_len_t*) pos;
 
@@ -420,7 +418,7 @@ mqtt_readUNSUBSCRIBE(mqtt_msg_t * __restrict buf, u_sh
 	len -= sizeof(mqtt_len_t);
 	if (len < 0) {
 		mqtt_SetErr(EINVAL, "Short message length %d", len);
-		return NULL;
+		return -1;
 	} else {
 		*msgID = ntohs(v->val);
 		pos += sizeof(mqtt_len_t);
@@ -428,7 +426,7 @@ mqtt_readUNSUBSCRIBE(mqtt_msg_t * __restrict buf, u_sh
 
 	subs = mqtt_subAlloc(0);
 	if (!subs)
-		return NULL;
+		return -1;
 	else
 		*subscr = subs;
 
@@ -439,28 +437,29 @@ mqtt_readUNSUBSCRIBE(mqtt_msg_t * __restrict buf, u_sh
 		if (len < 0) {
 			mqtt_subFree(subscr);
 			mqtt_SetErr(EINVAL, "Short message length %d", len);
-			return NULL;
+			return -1;
 		}
-		subs = mqtt_subRealloc(subs, i + 1);
-		if (!subs) {
+		if (!mqtt_subRealloc(&subs, i + 1)) {
 			mqtt_subFree(subscr);
-			return NULL;
+			return -1;
 		} else
 			*subscr = subs;
 
 		memset(&subs[i], 0, sizeof subs[i]);
 		subs[i].sub_topic.msg_len = ntohs(var->var_sb.val);
-		subs[i].sub_topic.msg_base = malloc(subs[i].sub_topic.msg_len);
+		subs[i].sub_topic.msg_base = malloc(subs[i].sub_topic.msg_len + 1);
 		if (!subs[i].sub_topic.msg_base) {
 			LOGERR;
 			mqtt_subFree(subscr);
-			return NULL;
-		} else
+			return -1;
+		} else {
 			memcpy(subs[i].sub_topic.msg_base, var->var_data, subs[i].sub_topic.msg_len);
+			((char*) subs[i].sub_topic.msg_base)[subs[i].sub_topic.msg_len] = 0;
+		}
 		pos += MQTTHDR_VAR_SIZEOF(var);
 	}
 
-	return hdr;
+	return i;
 }
 
 /*