github
/
mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix possible memory leaks when repeating options.

Browse Source
pull/2709/head
Roger A. Light 3 years ago
parent fa21712278
commit b157448b30
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File

10
lib/options.c
Unescape Escape View File

@ -212,18 +212,20 @@ 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;
} }
mosq->tls_ciphers = NULL; mosquitto__FREE(mosq->tls_ciphers);
mosq->tls_13_ciphers = NULL; mosquitto__FREE(mosq->tls_13_ciphers);
if(ciphers){ if(ciphers){
if(!strcasecmp(mosq->tls_version, "tlsv1.3")){ if(!strcasecmp(mosq->tls_version, "tlsv1.3")){
@ -274,7 +276,7 @@ int mosquitto_string_option(struct mosquitto *mosq, enum mosq_opt_t option, cons
switch(option){ switch(option){
case MOSQ_OPT_TLS_ENGINE: case MOSQ_OPT_TLS_ENGINE:
#if defined(WITH_TLS) && !defined(OPENSSL_NO_ENGINE) #if defined(WITH_TLS) && !defined(OPENSSL_NO_ENGINE)
mosquitto__free(mosq->tls_engine); mosquitto__FREE(mosq->tls_engine);
if(value){ if(value){
eng = ENGINE_by_id(value); eng = ENGINE_by_id(value);
if(!eng){ if(!eng){
@ -311,6 +313,7 @@ int mosquitto_string_option(struct mosquitto *mosq, enum mosq_opt_t option, cons
case MOSQ_OPT_TLS_ENGINE_KPASS_SHA1: case MOSQ_OPT_TLS_ENGINE_KPASS_SHA1:
#ifdef WITH_TLS #ifdef WITH_TLS
mosquitto__FREE(mosq->tls_engine_kpass_sha1);
if(mosquitto__hex2bin_sha1(value, (unsigned char**)&str) != MOSQ_ERR_SUCCESS){ if(mosquitto__hex2bin_sha1(value, (unsigned char**)&str) != MOSQ_ERR_SUCCESS){
return MOSQ_ERR_INVAL; return MOSQ_ERR_INVAL;
} }
@ -323,6 +326,7 @@ int mosquitto_string_option(struct mosquitto *mosq, enum mosq_opt_t option, cons
case MOSQ_OPT_TLS_ALPN: case MOSQ_OPT_TLS_ALPN:
#ifdef WITH_TLS #ifdef WITH_TLS
mosquitto__FREE(mosq->tls_alpn);
mosq->tls_alpn = mosquitto__strdup(value); mosq->tls_alpn = mosquitto__strdup(value);
if(!mosq->tls_alpn){ if(!mosq->tls_alpn){
return MOSQ_ERR_NOMEM; return MOSQ_ERR_NOMEM;

Write Preview
Loading…
Cancel
Save