Fix for read of fixed portion (2 bytes) of header when only 1 is retu…

…rned.
wolfSSL · Nov 21, 2023 · 60bdf1a · 60bdf1a
1 parent 052656c
commit 60bdf1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/mqtt_client.c b/src/mqtt_client.c
@@ -1087,7 +1087,8 @@ static int MqttClient_WaitType(MqttClient *client, void *packet_obj,
             if (rc <= 0) {
             #ifdef WOLFMQTT_NONBLOCK
                 if (rc == MQTT_CODE_CONTINUE &&
-                                          client->packet.stat > MQTT_PK_BEGIN) {
+                        (client->packet.stat > MQTT_PK_BEGIN ||
+                         client->read.total > 0)) {
                     /* advance state, since we received some data */
                     mms_stat->read = MQTT_MSG_HEADER;
                 }

diff --git a/src/mqtt_packet.c b/src/mqtt_packet.c
@@ -1963,7 +1963,6 @@ int MqttPacket_Read(MqttClient *client, byte* rx_buf, int rx_buf_len,
     {
         case MQTT_PK_BEGIN:
         {
-            client->read.pos = 0;
             client->packet.header_len = MQTT_PACKET_HEADER_MIN_SIZE;
             client->packet.remain_len = 0;