From e4b43df71ab859986e24d8cf69d549c8375ee666 Mon Sep 17 00:00:00 2001
From: Wiebe Cazemier <wiebe@halfgaar.net>
Date: Sat, 23 Apr 2022 12:56:06 +0200
Subject: [PATCH] Fix using uninitialized session expiry interval in disconnect

---
 mqttpacket.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mqttpacket.cpp b/mqttpacket.cpp
index f3ee26a..d85b211 100644
--- a/mqttpacket.cpp
+++ b/mqttpacket.cpp
@@ -666,7 +666,8 @@ void MqttPacket::handleDisconnect()
                 {
                 case Mqtt5Properties::SessionExpiryInterval:
                 {
-                    const uint32_t session_expire = std::min<uint32_t>(readFourBytesToUint32(), session_expire);
+                    const Settings *settings = ThreadGlobals::getSettings();
+                    const uint32_t session_expire = std::min<uint32_t>(readFourBytesToUint32(), settings->getExpireSessionAfterSeconds());
                     sender->getSession()->setSessionExpiryInterval(session_expire);
                     break;
                 }
--
libgit2 0.21.4