kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-06 13:07:21 +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 5d19dc2cb1
commit c1a608f862
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/stasis/app.c
View File

@@ -591,6 +591,7 @@ static int message_received_handler(const char *endpoint_id, struct ast_json *js
{ {
RAII_VAR(struct ast_endpoint_snapshot *, snapshot, NULL, ao2_cleanup); RAII_VAR(struct ast_endpoint_snapshot *, snapshot, NULL, ao2_cleanup);
struct ast_json *json_endpoint; struct ast_json *json_endpoint;
struct ast_json *message;
struct stasis_app *app = pvt; struct stasis_app *app = pvt;
char *tech; char *tech;
char *resource; char *resource;
@@ -616,11 +617,15 @@ static int message_received_handler(const char *endpoint_id, struct ast_json *js
return -1; return -1;
} }
app_send(app, ast_json_pack("{s: s, s: o, s: o, s: o}", message = ast_json_pack("{s: s, s: o, s: o, s: o}",
"type", "TextMessageReceived", "type", "TextMessageReceived",
"timestamp", ast_json_timeval(ast_tvnow(), NULL), "timestamp", ast_json_timeval(ast_tvnow(), NULL),
"endpoint", json_endpoint, "endpoint", json_endpoint,
"message", ast_json_ref(json_msg))); "message", ast_json_ref(json_msg));
if (message) {
app_send(app, message);
ast_json_unref(message);
}
return 0; return 0;
} }

12
res/stasis/messaging.c
View File

@@ -459,7 +459,11 @@ static struct message_subscription *get_or_create_subscription(struct ast_endpoi
ao2_link(endpoint_subscriptions, sub); ao2_link(endpoint_subscriptions, sub);
} else { } else {
ast_rwlock_wrlock(&tech_subscriptions_lock); 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); ast_rwlock_unlock(&tech_subscriptions_lock);
} }
@@ -487,7 +491,11 @@ int messaging_app_subscribe_endpoint(const char *app_name, struct ast_endpoint *
ao2_unlock(sub); ao2_unlock(sub);
return -1; 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); ao2_unlock(sub);
ast_debug(3, "App '%s' subscribed to messages from endpoint '%s'\n", app_name, endpoint ? ast_endpoint_get_id(endpoint) : "-- ALL --"); ast_debug(3, "App '%s' subscribed to messages from endpoint '%s'\n", app_name, endpoint ? ast_endpoint_get_id(endpoint) : "-- ALL --");