From 0ca274282ab97f04a93f9e7d8729d58fa48723da Mon Sep 17 00:00:00 2001 From: Wiebe Cazemier Date: Sun, 21 Mar 2021 10:14:03 +0100 Subject: [PATCH] Fix valid subscribe path check --- FlashMQTests/tst_maintests.cpp | 1 + mqttpacket.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/FlashMQTests/tst_maintests.cpp b/FlashMQTests/tst_maintests.cpp index 479266d..4c574d5 100644 --- a/FlashMQTests/tst_maintests.cpp +++ b/FlashMQTests/tst_maintests.cpp @@ -308,6 +308,7 @@ void MainTests::test_validSubscribePath() QVERIFY(isValidSubscribePath("//#")); QVERIFY(isValidSubscribePath("+")); QVERIFY(isValidSubscribePath("")); + QVERIFY(isValidSubscribePath("hello")); QVERIFY(!isValidSubscribePath("one/tw+o/three")); QVERIFY(!isValidSubscribePath("one/+o/three")); diff --git a/mqttpacket.cpp b/mqttpacket.cpp index 1ffb46c..6c84154 100644 --- a/mqttpacket.cpp +++ b/mqttpacket.cpp @@ -375,7 +375,7 @@ void MqttPacket::handleSubscribe() if (topic.empty() || !isValidUtf8(topic)) throw ProtocolError("Subscribe topic not valid UTF-8."); - if (isValidSubscribePath(topic)) + if (!isValidSubscribePath(topic)) throw ProtocolError(formatString("Invalid subscribe path: %s", topic.c_str())); char qos = readByte(); -- libgit2 0.21.4