Stasis/ARI: Fix off-nominal path json memory leaks.

Change-Id: Id569c624c426e3b22a99936473c730592d8b83fb

diff --git a/main/sorcery.c b/main/sorcery.c
index 713b038e6480425a1fe88bbca8149e90ac43a0df..1bdf2c2f853f15eb499eaf186c6337d79a96f258 100644 (file)
--- a/main/sorcery.c
+++ b/main/sorcery.c
@@ -1597,6 +1597,7 @@ struct ast_json *ast_sorcery_objectset_json_create(const struct ast_sorcery *sor
        int res = 0;
 
        if (!object_type || !json) {
+               ast_json_unref(json);
                return NULL;
        }
 

diff --git a/res/ari/resource_asterisk.c b/res/ari/resource_asterisk.c
index 30684d276052b4b5608020530d63e61d94b1ce8a..dafe9a6027be4482c58a8fc22baa959d5339dbed 100644 (file)
--- a/res/ari/resource_asterisk.c
+++ b/res/ari/resource_asterisk.c
@@ -435,6 +435,10 @@ void ast_ari_asterisk_list_modules(struct ast_variable *headers,
        struct ast_json *json;
 
        json = ast_json_array_create();
+       if (!json) {
+               ast_ari_response_alloc_failed(response);
+               return;
+       }
        ast_update_module_list_data(&process_module_list, NULL, json);
 
        ast_ari_response_ok(response, json);
@@ -507,6 +511,7 @@ void ast_ari_asterisk_get_module(struct ast_variable *headers,
                ast_ari_response_error(
                        response, 409, "Conflict",
                        "Module information could not be retrieved");
+               ast_json_unref(json);
                return;
        }
 
@@ -669,10 +674,12 @@ void ast_ari_asterisk_list_log_channels(struct ast_variable *headers,
        if (res == AST_LOGGER_FAILURE) {
                ast_ari_response_error(response, 500, "Internal Server Error",
                        "Response body is not valid");
+               ast_json_unref(json);
                return;
        } else if (res == AST_LOGGER_ALLOC_ERROR) {
                ast_ari_response_error(response, 500, "Internal Server Error",
                        "Allocation Failed");
+               ast_json_unref(json);
                return;
        }
 

diff --git a/res/ari/resource_sounds.c b/res/ari/resource_sounds.c
index 5a523d38775ac69c9146dd319c0acc25735af3b3..76a4d9436296ba14d42f993c3151246b54c06aa4 100644 (file)
--- a/res/ari/resource_sounds.c
+++ b/res/ari/resource_sounds.c
@@ -204,6 +204,7 @@ void ast_ari_sounds_list(struct ast_variable *headers,
 
        if (!ast_json_array_size(sounds_blob)) {
                ast_ari_response_error(response, 404, "Not Found", "No sounds found that matched the query");
+               ast_json_unref(sounds_blob);
                return;
        }
 

diff --git a/res/res_ari.c b/res/res_ari.c
index 1ac5327358af2afe76e418d4397a7a34456ebc3b..e4b50ab117aba4e4ef7dc106ebbd4cc425bd7118 100644 (file)
--- a/res/res_ari.c
+++ b/res/res_ari.c
@@ -983,9 +983,11 @@ static int ast_ari_callback(struct ast_tcptls_session_instance *ser,
                struct ast_str *buf = ast_str_create(512);
                char *str = ast_json_dump_string_format(body, ast_ari_json_format());
 
-               if (!buf) {
+               if (!buf || !str) {
                        ast_http_request_close_on_completion(ser);
                        ast_http_error(ser, 500, "Server Error", "Out of memory");
+                       ast_json_free(str);
+                       ast_free(buf);
                        goto request_failed;
                }
 

diff --git a/res/stasis/messaging.c b/res/stasis/messaging.c
index 229a3a6462be7db773d938e01b34a2e30bcf8bc0..d2df3ff0c9effcc99e649962ccedfc51b4b1d750 100644 (file)
--- a/res/stasis/messaging.c
+++ b/res/stasis/messaging.c
@@ -266,6 +266,7 @@ static struct ast_json *msg_to_json(struct ast_msg *msg)
 
        json_vars = ast_json_array_create();
        if (!json_vars) {
+               ast_msg_var_iterator_destroy(it_vars);
                return NULL;
        }
 
@@ -274,7 +275,8 @@ static struct ast_json *msg_to_json(struct ast_msg *msg)
 
                json_tuple = ast_json_pack("{s: s}", name, value);
                if (!json_tuple) {
-                       ast_json_free(json_vars);
+                       ast_json_unref(json_vars);
+                       ast_msg_var_iterator_destroy(it_vars);
                        return NULL;
                }