diff options
| author | Joshua Colp <jcolp@digium.com> | 2014-01-12 22:24:27 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2014-01-12 22:24:27 +0000 |
| commit | 8585340b8768562bbffc0cfe51b7a59f197cd8a0 (patch) | |
| tree | cabf6d29832d0606f66729ff84b4e5741cf24d6f /res/ari/resource_applications.c | |
| parent | 373965dbff734b96132f61741838d6797c4a1876 (diff) | |
res_ari: Fix various memory leaks.
This change fixes a few memory leaks that were found based
on a mailing list post.
1. Some JSON response messages were never freed. This was
caused by the documentation stating that message references
were stolen when in reality they were not. The code now follows
the documentation and usage has been updated.
2. HTTP response headers were never freed.
3. The variable list for wildcards paths was never freed.
(closes issue ASTERISK-23128)
Reported by: Kenneth Watson (on list)
Review: https://reviewboard.asterisk.org/r/3119/
........
Merged revisions 405325 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@405326 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/ari/resource_applications.c')
| -rw-r--r-- | res/ari/resource_applications.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/res/ari/resource_applications.c b/res/ari/resource_applications.c index aef939005..85a631a02 100644 --- a/res/ari/resource_applications.c +++ b/res/ari/resource_applications.c @@ -68,15 +68,14 @@ void ast_ari_applications_list(struct ast_variable *headers, return; } - - ast_ari_response_ok(response, json); + ast_ari_response_ok(response, ast_json_ref(json)); } void ast_ari_applications_get(struct ast_variable *headers, struct ast_ari_applications_get_args *args, struct ast_ari_response *response) { - RAII_VAR(struct ast_json *, json, NULL, ast_json_unref); + struct ast_json *json; json = stasis_app_to_json(args->application_name); @@ -113,7 +112,7 @@ void ast_ari_applications_subscribe(struct ast_variable *headers, switch (res) { case STASIS_ASR_OK: - ast_ari_response_ok(response, json); + ast_ari_response_ok(response, ast_json_ref(json)); break; case STASIS_ASR_APP_NOT_FOUND: ast_ari_response_error(response, 404, "Not Found", @@ -152,7 +151,7 @@ void ast_ari_applications_unsubscribe(struct ast_variable *headers, switch (res) { case STASIS_ASR_OK: - ast_ari_response_ok(response, json); + ast_ari_response_ok(response, ast_json_ref(json)); break; case STASIS_ASR_APP_NOT_FOUND: ast_ari_response_error(response, 404, "Not Found", |