--- mqtt/src/Attic/conn.c	2011/12/05 17:05:38	1.1.2.9
+++ mqtt/src/Attic/conn.c	2011/12/09 09:53:54	1.1.2.10
@@ -32,15 +32,15 @@ mqtt_msgCONNECT(mqtt_msg_t * __restrict buf, const cha
 
 	if (!buf || !csConnID)
 		return -1;
-	if (strlen(csConnID) > 23) {
+	if (strlen(csConnID) > 24) {
 		mqtt_SetErr(EINVAL, "Error:: invalid argument ConnID is too long (max 23 bytes)");
 		return -1;
 	}
-	if (csUser && strlen(csUser) > 12) {
+	if (csUser && strlen(csUser) > 13) {
 		mqtt_SetErr(EINVAL, "Error:: invalid argument Username is too long (max 12 bytes)");
 		return -1;
 	}
-	if (csPass && strlen(csPass) > 12) {
+	if (csPass && strlen(csPass) > 13) {
 		mqtt_SetErr(EINVAL, "Error:: invalid argument Password is too long (max 12 bytes)");
 		return -1;
 	}
@@ -254,15 +254,13 @@ mqtt_msgDISCONNECT(mqtt_msg_t * __restrict buf)
  * @psPass = Password for Username, only if csUser is set
  * @passLen = Password length
  * @psWillTopic = Will Topic if !=NULL Will Flags set into message
- * @topicLen = Will Topic length
  * @psWillMessage = Will Message, may be NULL
- * @msgLen = Will Message length
  * return: .reserved == 1 is error or == 0 connection flags & msg ok
  */
 mqtthdr_connflgs_t
 mqtt_readCONNECT(mqtt_msg_t * __restrict buf, u_short *kasec, char * __restrict psConnID, int connLen, 
 		char * __restrict psUser, int userLen, char * __restrict psPass, int passLen,  
-		char * __restrict psWillTopic, int topicLen, char * __restrict psWillMessage, int msgLen)
+		char ** __restrict psWillTopic, char ** __restrict psWillMessage)
 {
 	mqtthdr_connflgs_t flg = MQTT_CONNFLGS_INIT;
 	struct mqtthdr *hdr;
@@ -329,10 +327,15 @@ mqtt_readCONNECT(mqtt_msg_t * __restrict buf, u_short 
 			flg.reserved = 1;
 			return flg;
 		} else {
-			if (psWillTopic && topicLen) {
-				memset(psWillTopic, 0, topicLen--);
-				memcpy(psWillTopic, var->var_data, 
-						ntohs(var->var_sb.val) > topicLen ? topicLen : ntohs(var->var_sb.val));
+			if (psWillTopic) {
+				*psWillTopic = malloc(ntohs(var->var_sb.val) + 1);
+				if (!*psWillTopic) {
+					LOGERR;
+					flg.reserved = 1;
+					return flg;
+				} else
+					memset(*psWillTopic, 0, ntohs(var->var_sb.val) + 1);
+				memcpy(*psWillTopic, var->var_data, ntohs(var->var_sb.val));
 			}
 			pos += MQTTHDR_VAR_SIZEOF(var);
 		}
@@ -344,10 +347,15 @@ mqtt_readCONNECT(mqtt_msg_t * __restrict buf, u_short 
 			flg.reserved = 1;
 			return flg;
 		} else {
-			if (psWillMessage && msgLen) {
-				memset(psWillMessage, 0, msgLen--);
-				memcpy(psWillMessage, var->var_data, 
-						ntohs(var->var_sb.val) > msgLen ? msgLen : ntohs(var->var_sb.val));
+			if (psWillMessage) {
+				*psWillMessage = malloc(ntohs(var->var_sb.val) + 1);
+				if (!*psWillMessage) {
+					LOGERR;
+					flg.reserved = 1;
+					return flg;
+				} else
+					memset(*psWillMessage, 0, ntohs(var->var_sb.val) + 1);
+				memcpy(*psWillMessage, var->var_data, ntohs(var->var_sb.val));
 			}
 			pos += MQTTHDR_VAR_SIZEOF(var);
 		}