--- mqtt/src/mqttd_calls.c	2012/06/20 09:23:28	1.2.2.23
+++ mqtt/src/mqttd_calls.c	2012/06/20 14:51:38	1.2.2.24
@@ -257,27 +257,29 @@ cmdSUBSCRIBE(void *srv, int len, void *arg)
 			SLIST_INSERT_HEAD(&sess->sess_subscr, store, st_node);
 
 			/* convert topic to regexp */
-			if (mqtt_expandTopic(subs[i].sub_topic.msg_base, buf, sizeof buf, 1, 0) == -1) {
+			if (mqtt_expandTopic(subs[i].sub_topic.msg_base, buf, sizeof buf, 1, 1) == -1) {
 				ioDEBUG(5, "Error:: in regexp #%d - %s", mqtt_GetErrno(), mqtt_GetError());
-				goto end;
+
+				subs[i].sub_ret = MQTT_QOS_DENY;
 			} else {
 				ptr = realloc(store->st_subscr.sub_topic.msg_base, strlen(buf) + 1);
 				if (!ptr) {
 					ioSYSERR(0);
-					goto end;
+
+					subs[i].sub_ret = MQTT_QOS_DENY;
 				} else {
 					store->st_subscr.sub_topic.msg_base = ptr;
 					store->st_subscr.sub_topic.msg_len = strlen(buf) + 1;
 					memcpy(store->st_subscr.sub_topic.msg_base, buf, 
 							store->st_subscr.sub_topic.msg_len);
 				}
-			}
 
-			call.LOG(logg, "Added [%s] SUBSCRIBE '%s'(%d) from %s\n", sess->sess_cid, 
-					store->st_subscr.sub_topic.msg_base, 
-					store->st_subscr.sub_topic.msg_len, sess->sess_addr);
+				call.LOG(logg, "Added [%s] SUBSCRIBE '%s'(%d) from %s\n", sess->sess_cid, 
+						store->st_subscr.sub_topic.msg_base, 
+						store->st_subscr.sub_topic.msg_len, sess->sess_addr);
 
-			subs[i].sub_ret = MQTT_QOS_PASS;
+				subs[i].sub_ret = MQTT_QOS_PASS;
+			}
 		} else
 			subs[i].sub_ret = MQTT_QOS_DENY;
 	}