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

[470253] Fix potential memory leaks.

Browse Source 
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=470253
Also-by: Wun Yu <wuyun1984_1984@163.com>
This commit is contained in:
Roger A. Light 2015-08-17 22:10:26 +01:00
parent ab7f212b7e
commit 2172ffb56c
3 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -6,6 +6,7 @@ Broker:
- Fix handling of outgoing QoS>0 messages for bridges that could not be sent
because the bridge connection was down.
- Free unused topic tree elements. Closes #468987.
- Fix some potential memory leaks. Closes #470253.
Client library:
- Add missing error strings to mosquitto_strerror.

1
THANKS.txt
View File

@ -86,5 +86,6 @@ Toby Jaffey
Tomas Novotny
Vicente Ruiz
Wayne Ingram
Yun Wu
Yuvraaj Kelkar
賴 冠廷

34
src/subs.c
View File

@ -244,6 +244,7 @@ static void _sub_topic_tokens_free(struct _sub_token *tokens)
}
static int _sub_add(struct mosquitto_db *db, struct mosquitto *context, int qos, struct _mosquitto_subhier *subhier, struct _sub_token *tokens)
/* FIXME - this function has the potential to leak subhier, audit calling functions. */
{
struct _mosquitto_subhier *branch, *last = NULL;
struct _mosquitto_subleaf *leaf, *last_leaf;
@ -276,31 +277,21 @@ static int _sub_add(struct mosquitto_db *db, struct mosquitto *context, int qos,
leaf->next = NULL;
leaf->context = context;
leaf->qos = qos;
if(context->subs){
for(i=0; i<context->sub_count; i++){
if(!context->subs[i]){
context->subs[i] = subhier;
break;
}
for(i=0; i<context->sub_count; i++){
if(!context->subs[i]){
context->subs[i] = subhier;
break;
}
if(i == context->sub_count){
context->sub_count++;
subs = _mosquitto_realloc(context->subs, sizeof(struct _mosquitto_subhier *)*context->sub_count);
if(!subs){
_mosquitto_free(leaf);
return MOSQ_ERR_NOMEM;
}
context->subs = subs;
context->subs[context->sub_count-1] = subhier;
}
}else{
context->sub_count = 1;
context->subs = _mosquitto_malloc(sizeof(struct _mosquitto_subhier *)*context->sub_count);
if(!context->subs){
}
if(i == context->sub_count){
subs = _mosquitto_realloc(context->subs, sizeof(struct _mosquitto_subhier *)*(context->sub_count + 1));
if(!subs){
_mosquitto_free(leaf);
return MOSQ_ERR_NOMEM;
}
context->subs[0] = subhier;
context->subs = subs;
context->sub_count++;
context->subs[context->sub_count-1] = subhier;
}
if(last_leaf){
last_leaf->next = leaf;
@ -464,6 +455,7 @@ int mqtt3_sub_add(struct mosquitto_db *db, struct mosquitto *context, const char
child->topic = _mosquitto_strdup(tokens->topic);
if(!child->topic){
_sub_topic_tokens_free(tokens);
_mosquitto_free(child);
_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory.");
return MOSQ_ERR_NOMEM;
}