From efc5706f57944efbaba48f5a33e9dc20f314fd53 Mon Sep 17 00:00:00 2001 From: Ian Craggs Date: Fri, 28 Jan 2022 23:10:50 +0000 Subject: [PATCH 1/2] Set default port for WSS to 443 #1048 --- src/MQTTProtocolOut.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/MQTTProtocolOut.c b/src/MQTTProtocolOut.c index 1d6aab83..25ca0a18 100644 --- a/src/MQTTProtocolOut.c +++ b/src/MQTTProtocolOut.c @@ -333,7 +333,10 @@ int MQTTProtocol_connect(const char* ip_address, Clients* aClient, int websocket } if ( websocket ) { - rc = WebSocket_connect( &aClient->net, 0, ip_address ); +#if defined(OPENSSL) + rc = WebSocket_connect(&aClient->net, ssl, ip_address); +#endif + rc = WebSocket_connect(&aClient->net, 0, ip_address); if ( rc == TCPSOCKET_INTERRUPTED ) aClient->connect_state = WEBSOCKET_IN_PROGRESS; /* Websocket connect called - wait for completion */ } From d03b3ba6a10e50fa146080ea436bd39aaa791aea Mon Sep 17 00:00:00 2001 From: Daniel Starikov Date: Thu, 6 Jan 2022 19:21:26 -0800 Subject: [PATCH 2/2] Fix for issue #1190 use-after-free when discarding the oldest message with persistence --- src/MQTTAsyncUtils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/MQTTAsyncUtils.c b/src/MQTTAsyncUtils.c index 1a37b561..a7dc35e0 100644 --- a/src/MQTTAsyncUtils.c +++ b/src/MQTTAsyncUtils.c @@ -889,11 +889,12 @@ int MQTTAsync_addCommand(MQTTAsync_queuedCommand* command, int command_size) { ListDetach(MQTTAsync_commands, first_publish); - MQTTAsync_freeCommand(first_publish); #if !defined(NO_PERSISTENCE) if (command->client->c->persistence) MQTTAsync_unpersistCommand(first_publish); #endif + + MQTTAsync_freeCommand(first_publish); } } else