kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-16 17:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_stasis: Fix multiple leaks.

Browse Source 
* res/stasis/app.c JSON passed to app_send needs to be released.
* res/stasis_message.c: objects leak if vector append fails.

Change-Id: I8dd5385b9f50a5cadf2b1d16efecffd6ddb4db4a
This commit is contained in:
Corey Farrell
2017-11-06 18:21:53 -05:00
parent 637b37fb98
commit 801094da7b
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/stasis/messaging.c
View File

@@ -457,7 +457,11 @@ static struct message_subscription *get_or_create_subscription(struct ast_endpoi
ao2_link(endpoint_subscriptions, sub);
} else {
ast_rwlock_wrlock(&tech_subscriptions_lock);
AST_VECTOR_APPEND(&tech_subscriptions, ao2_bump(sub));
if (AST_VECTOR_APPEND(&tech_subscriptions, ao2_bump(sub))) {
/* Release the ao2_bump that was for the vector and allocation references. */
ao2_ref(sub, -2);
sub = NULL;
}
ast_rwlock_unlock(&tech_subscriptions_lock);
}
@@ -485,7 +489,11 @@ int messaging_app_subscribe_endpoint(const char *app_name, struct ast_endpoint *
ao2_unlock(sub);
return -1;
}
AST_VECTOR_APPEND(&sub->applications, tuple);
if (AST_VECTOR_APPEND(&sub->applications, tuple)) {
ao2_ref(tuple, -1);
ao2_unlock(sub);
return -1;
}
ao2_unlock(sub);
ast_debug(3, "App '%s' subscribed to messages from endpoint '%s'\n", app_name, endpoint ? ast_endpoint_get_id(endpoint) : "-- ALL --");