Merge branch 'develop' into mqttv5

src/MQTTAsync.c

@@ -34,6 +34,7 @@
  *    Ian Craggs - auto reconnect timing fix #218
  *    Ian Craggs - fix for issue #190
  *    Ian Craggs - check for NULL SSL options #334
+ *    Ian Craggs - allocate username/password buffers #431
  *    Ian Craggs - MQTT 5.0 support
  *******************************************************************************/
 
@@ -2439,14 +2440,22 @@ int MQTTAsync_connect(MQTTAsync handle, const MQTTAsync_connectOptions* options)
 	}
 #endif
 
-	m->c->username = options->username;
-	m->c->password = options->password;
+	if (m->c->username)
+		free((void*)m->c->username);
+	if (options->username)
+		m->c->username = MQTTStrdup(options->username);
+	if (m->c->password)
+		free((void*)m->c->password);
 	if (options->password)
+	{
+		m->c->password = MQTTStrdup(options->password);
 		m->c->passwordlen = strlen(options->password);
+	}
 	else if (options->struct_version >= 5 && options->binarypwd.data)
 	{
-		m->c->password = options->binarypwd.data;
 		m->c->passwordlen = options->binarypwd.len;
+		m->c->password = malloc(m->c->passwordlen);
+		memcpy((void*)m->c->password, options->binarypwd.data, m->c->passwordlen);
 	}
 
 	m->c->retryInterval = options->retryInterval;

src/MQTTClient.c

@@ -33,6 +33,7 @@
  *    Ian Craggs - binary will message support
  *    Ian Craggs - waitforCompletion fix #240
  *    Ian Craggs - check for NULL SSL options #334
+ *    Ian Craggs - allocate username/password buffers #431
  *    Ian Craggs - MQTT 5.0 support
  *******************************************************************************/
 
@@ -1159,16 +1160,23 @@ static MQTTResponse MQTTClient_connectURI(MQTTClient handle, MQTTClient_connectO
 	}
 #endif
 
-	m->c->username = options->username;
-	m->c->password = options->password;
+	if (m->c->username)
+		free((void*)m->c->username);
+	if (options->username)
+		m->c->username = MQTTStrdup(options->username);
+	if (m->c->password)
+		free((void*)m->c->password);
 	if (options->password)
+	{
+		m->c->password = MQTTStrdup(options->password);
 		m->c->passwordlen = strlen(options->password);
+	}
 	else if (options->struct_version >= 5 && options->binarypwd.data)
 	{
-		m->c->password = options->binarypwd.data;
 		m->c->passwordlen = options->binarypwd.len;
+		m->c->password = malloc(m->c->passwordlen);
+		memcpy((void*)m->c->password, options->binarypwd.data, m->c->passwordlen);
 	}
-	m->c->retryInterval = options->retryInterval;
 
 	if (options->struct_version >= 3)
 		MQTTVersion = options->MQTTVersion;

src/MQTTProtocolClient.c

@@ -681,6 +681,10 @@ void MQTTProtocol_freeClient(Clients* client)
 		free(client->will->topic);
 		free(client->will);
 	}
+	if (client->username)
+		free((void*)client->username);
+	if (client->password)
+		free((void*)client->password);
 #if defined(OPENSSL)
 	if (client->sslopts)
 	{