--- libaitmqtt/src/aitmqtt.c	2012/04/26 15:26:37	1.1.1.1.2.7
+++ libaitmqtt/src/aitmqtt.c	2012/04/26 15:38:32	1.1.1.1.2.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitmqtt.c,v 1.1.1.1.2.7 2012/04/26 15:26:37 misho Exp $
+* $Id: aitmqtt.c,v 1.1.1.1.2.8 2012/04/26 15:38:32 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -287,11 +287,10 @@ mqtt_str2subs(const char **csStr, u_short strnum, u_ch
 
 	if (!csStr)
 		return NULL;
-	for (items = 0, strs = csStr; *strs; items++, strs++)
-		if (strnum && items >= strnum) {
-			items = strnum;
-			break;
-		}
+
+	for (items = 0, strs = csStr; 
+			(!strnum || (strnum && items < strnum)) && *strs; 
+			items++, strs++);
 
 	if (!(v = malloc((items + 1) * sizeof(mqtt_subscr_t)))) {
 		LOGERR;