Merge pull request #1831 from cesanta/mqtt

Accept zero-length payload messages
This commit is contained in:
Sergey Lyubka 2022-11-03 16:46:56 +00:00 committed by GitHub
commit 1f85fcc9b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -3195,7 +3195,7 @@ int mg_mqtt_parse(const uint8_t *buf, size_t len, uint8_t version,
m->id = (uint16_t) ((((uint16_t) p[0]) << 8) | p[1]);
p += 2;
}
if (p >= end) return MQTT_MALFORMED;
if (p > end) return MQTT_MALFORMED;
if (version == 5) p += 1 + p[0]; // Skip options
if (p > end) return MQTT_MALFORMED;
m->data.ptr = (char *) p;

View File

@ -172,7 +172,7 @@ int mg_mqtt_parse(const uint8_t *buf, size_t len, uint8_t version,
m->id = (uint16_t) ((((uint16_t) p[0]) << 8) | p[1]);
p += 2;
}
if (p >= end) return MQTT_MALFORMED;
if (p > end) return MQTT_MALFORMED;
if (version == 5) p += 1 + p[0]; // Skip options
if (p > end) return MQTT_MALFORMED;
m->data.ptr = (char *) p;