diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-11-08 04:59:15 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-11-08 04:59:15 -0600 |
| commit | 4e8271c2a5e292989e09629799d5d39ade3ac241 (patch) | |
| tree | 71b6d78ed9c66da3d639096a7d91cf99ff7d026f /res | |
| parent | fe78531d5ee538bbcd49cae564d4931285704ef1 (diff) | |
| parent | c1a608f86204aac742812f78aa8f29bc78ea0041 (diff) | |
Merge "res_stasis: Fix multiple leaks." into 13
Diffstat (limited to 'res')
| -rw-r--r-- | res/stasis/app.c | 9 | ||||
| -rw-r--r-- | res/stasis/messaging.c | 12 |
2 files changed, 17 insertions, 4 deletions
diff --git a/res/stasis/app.c b/res/stasis/app.c index 7d88c1b6e..1e885c6f8 100644 --- a/res/stasis/app.c +++ b/res/stasis/app.c @@ -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); struct ast_json *json_endpoint; + struct ast_json *message; struct stasis_app *app = pvt; char *tech; char *resource; @@ -616,11 +617,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; } diff --git a/res/stasis/messaging.c b/res/stasis/messaging.c index d2df3ff0c..979b687ab 100644 --- a/res/stasis/messaging.c +++ b/res/stasis/messaging.c @@ -459,7 +459,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); } @@ -487,7 +491,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 --"); |