kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_stasis: Fix multiple leaks."

Browse Source
This commit is contained in:
Joshua Colp
2017-11-08 04:58:12 -06:00
committed by Gerrit Code Review
parent 0129e396b2 801094da7b
commit d91d0e992d
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

@@ -588,6 +588,7 @@ static int message_received_handler(const char *endpoint_id, struct ast_json *js
{
RAII_VAR(struct ast_endpoint_snapshot *, snapshot, NULL, ao2_cleanup);
struct ast_json *json_endpoint;
struct ast_json *message;
struct stasis_app *app = pvt;
char *tech;
char *resource;
@@ -613,11 +614,15 @@ static int message_received_handler(const char *endpoint_id, struct ast_json *js
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",
"timestamp", ast_json_timeval(ast_tvnow(), NULL),
"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;
}

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 --");