Merge pull request #172 from MartinKlang/fix/reconnect-init-initialis…

…ation Fix mqtt_init_reconnect initialisation
LiamBindle · Oct 27, 2022 · 694c21b · 694c21b
2 parents 0f4c34c + c7035ed
commit 694c21b
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/mqtt.c b/src/mqtt.c
@@ -172,6 +172,7 @@ void mqtt_init_reconnect(struct mqtt_client *client,
     client->number_of_keep_alives = 0;
     client->typical_response_time = -1.0f;
     client->publish_response_callback = publish_response_callback;
+    client->pid_lfsr = 0;
     client->send_offset = 0;
 
     client->inspector_callback = NULL;
@@ -1614,14 +1615,11 @@ ssize_t mqtt_pack_unsubscribe_request(uint8_t *buf, size_t bufsz, unsigned int p
 /* MESSAGE QUEUE */
 void mqtt_mq_init(struct mqtt_message_queue *mq, void *buf, size_t bufsz) 
 {  
-    if(buf != NULL)
-    {
-        mq->mem_start = buf;
-        mq->mem_end = (uint8_t *)buf + bufsz;
-        mq->curr = (uint8_t *)buf;
-        mq->queue_tail = (struct mqtt_queued_message *)mq->mem_end;
-        mq->curr_sz = (size_t) (mqtt_mq_currsz(mq));
-    }
+    mq->mem_start = buf;
+    mq->mem_end = (uint8_t *)buf + bufsz;
+    mq->curr = (uint8_t *)buf;
+    mq->queue_tail = (struct mqtt_queued_message *)mq->mem_end;
+    mq->curr_sz = buf == NULL ? 0 : mqtt_mq_currsz(mq);
 }
 
 struct mqtt_queued_message* mqtt_mq_register(struct mqtt_message_queue *mq, size_t nbytes)