From a3444a22d72b3035cdc79e823e6345f99bbe7586 Mon Sep 17 00:00:00 2001 From: Ian Craggs Date: Mon, 10 Jul 2023 13:48:19 +0100 Subject: [PATCH] Topic matching bug with trailing / #174 --- MQTTClient-C/src/MQTTClient.c | 2 +- MQTTClient/src/MQTTClient.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MQTTClient-C/src/MQTTClient.c b/MQTTClient-C/src/MQTTClient.c index dc7e89c5..aaba8238 100755 --- a/MQTTClient-C/src/MQTTClient.c +++ b/MQTTClient-C/src/MQTTClient.c @@ -173,7 +173,7 @@ static char isTopicMatched(char* topicFilter, MQTTString* topicName) curn++; }; - return (curn == curn_end) && (*curf == '\0'); + return (curn == curn_end) && (*curf == '\0' || *curf == '#'); } diff --git a/MQTTClient/src/MQTTClient.h b/MQTTClient/src/MQTTClient.h index 7e933103..fc9dea5d 100644 --- a/MQTTClient/src/MQTTClient.h +++ b/MQTTClient/src/MQTTClient.h @@ -538,7 +538,7 @@ bool MQTT::Client::isTopicMatched(char* topicFilter, MQTTS curn++; }; - return (curn == curn_end) && (*curf == '\0'); + return (curn == curn_end) && (*curf == '\0' || *curf == '#'); }