Merge pull request #2683 from guillaumepellegrino/fixes_memleak

Fix memory leak in mosquitto_tls_opts_set()
pull/2742/head
Roger Light 3 years ago committed by GitHub
commit 80a4063bb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -228,19 +228,23 @@ int mosquitto_tls_opts_set(struct mosquitto *mosq, int cert_reqs, const char *tl
|| !strcasecmp(tls_version, "tlsv1.2") || !strcasecmp(tls_version, "tlsv1.2")
|| !strcasecmp(tls_version, "tlsv1.1")){ || !strcasecmp(tls_version, "tlsv1.1")){
mosquitto__free(mosq->tls_version);
mosq->tls_version = mosquitto__strdup(tls_version); mosq->tls_version = mosquitto__strdup(tls_version);
if(!mosq->tls_version) return MOSQ_ERR_NOMEM; if(!mosq->tls_version) return MOSQ_ERR_NOMEM;
}else{ }else{
return MOSQ_ERR_INVAL; return MOSQ_ERR_INVAL;
} }
}else{ }else{
mosquitto__free(mosq->tls_version);
mosq->tls_version = mosquitto__strdup("tlsv1.2"); mosq->tls_version = mosquitto__strdup("tlsv1.2");
if(!mosq->tls_version) return MOSQ_ERR_NOMEM; if(!mosq->tls_version) return MOSQ_ERR_NOMEM;
} }
if(ciphers){ if(ciphers){
mosquitto__free(mosq->tls_ciphers);
mosq->tls_ciphers = mosquitto__strdup(ciphers); mosq->tls_ciphers = mosquitto__strdup(ciphers);
if(!mosq->tls_ciphers) return MOSQ_ERR_NOMEM; if(!mosq->tls_ciphers) return MOSQ_ERR_NOMEM;
}else{ }else{
mosquitto__free(mosq->tls_ciphers);
mosq->tls_ciphers = NULL; mosq->tls_ciphers = NULL;
} }

Loading…
Cancel
Save