Fix parsing of MQTT QoS > 0 PUBLISH messages

Message ID comes after topic, not before. PUBLISHED_FROM=1ec2a56e290b67061b18c745671dc7f089b9cc0d

Fix parsing of MQTT QoS > 0 PUBLISH messages
Message ID comes after topic, not before. PUBLISHED_FROM=1ec2a56e290b67061b18c745671dc7f089b9cc0d
16700244 · Deomid Ryabkov · Cesanta Bot · 49ca223e · 16700244
Commit 16700244 authored Mar 07, 2017 by Deomid Ryabkov Committed by Cesanta Bot Mar 07, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

mongoose.c mongoose.c +2 -3

No files found.
--- a/mongoose.c
+++ b/mongoose.c
@@ -9667,12 +9667,11 @@ MG_INTERNAL int parse_mqtt(struct mbuf *io, struct mg_mqtt_message *mm) {
      mm->message_id = getu16(p);
      break;
    case MG_MQTT_CMD_PUBLISH: {
-      if (MG_MQTT_GET_QOS(header) > 0) {
+      p = scanto(p, &mm->topic);
+      if (mm->qos > 0) {
        mm->message_id = getu16(p);
        p += 2;
      }
-      p = scanto(p, &mm->topic);
-
      mm->payload.p = p;
      mm->payload.len = end - p;
      break;