kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_ari: Fix various memory leaks.

Browse Source 
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
This commit is contained in:
Joshua Colp
2014-01-12 22:24:27 +00:00
parent 373965dbff
commit 8585340b87
9 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/ari/resource_applications.c
View File

@@ -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",

4
res/ari/resource_bridges.c
View File

@@ -411,7 +411,7 @@ void ast_ari_bridges_play(struct ast_variable *headers,
play_channel = NULL;
control = NULL;
ast_ari_response_created(response, playback_url, json);
ast_ari_response_created(response, playback_url, ast_json_ref(json));
}
void ast_ari_bridges_record(struct ast_variable *headers,
@@ -566,7 +566,7 @@ void ast_ari_bridges_record(struct ast_variable *headers,
record_channel = NULL;
control = NULL;
ast_ari_response_created(response, recording_url, json);
ast_ari_response_created(response, recording_url, ast_json_ref(json));
}
void ast_ari_bridges_start_moh(struct ast_variable *headers,

4
res/ari/resource_channels.c
View File

@@ -362,7 +362,7 @@ void ast_ari_channels_play(struct ast_variable *headers,
RAII_VAR(struct ast_channel_snapshot *, snapshot, NULL, ao2_cleanup);
RAII_VAR(struct stasis_app_playback *, playback, NULL, ao2_cleanup);
RAII_VAR(char *, playback_url, NULL, ast_free);
RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
struct ast_json *json;
const char *language;
ast_assert(response != NULL);
@@ -434,7 +434,7 @@ void ast_ari_channels_record(struct ast_variable *headers,
RAII_VAR(struct ast_channel_snapshot *, snapshot, NULL, ao2_cleanup);
RAII_VAR(struct stasis_app_recording *, recording, NULL, ao2_cleanup);
RAII_VAR(char *, recording_url, NULL, ast_free);
RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
struct ast_json *json;
RAII_VAR(struct stasis_app_recording_options *, options, NULL,
ao2_cleanup);
RAII_VAR(char *, uri_encoded_name, NULL, ast_free);

4
res/ari/resource_device_states.c
View File

@@ -35,7 +35,7 @@ void ast_ari_device_states_list(
struct ast_ari_device_states_list_args *args,
struct ast_ari_response *response)
{
RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
struct ast_json *json;
if (!(json = stasis_app_device_states_to_json())) {
ast_ari_response_error(response, 500,
@@ -50,7 +50,7 @@ void ast_ari_device_states_get(struct ast_variable *headers,
struct ast_ari_device_states_get_args *args,
struct ast_ari_response *response)
{
RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
struct ast_json *json;
if (!(json = stasis_app_device_state_to_json(
args->device_name, ast_device_state(args->device_name)))) {

4
res/ari/resource_endpoints.c
View File

@@ -158,7 +158,7 @@ void ast_ari_endpoints_get(struct ast_variable *headers,
struct ast_ari_endpoints_get_args *args,
struct ast_ari_response *response)
{
RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
struct ast_json *json;
RAII_VAR(struct ast_endpoint_snapshot *, snapshot, NULL, ao2_cleanup);
snapshot = ast_endpoint_latest_snapshot(args->tech, args->resource);
@@ -174,5 +174,5 @@ void ast_ari_endpoints_get(struct ast_variable *headers,
return;
}
ast_ari_response_ok(response, ast_json_ref(json));
ast_ari_response_ok(response, json);
}

4
res/ari/resource_playbacks.c
View File

@@ -35,7 +35,7 @@ void ast_ari_playbacks_get(struct ast_variable *headers,
struct ast_ari_response *response)
{
RAII_VAR(struct stasis_app_playback *, playback, NULL, ao2_cleanup);
RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
struct ast_json *json;
playback = stasis_app_playback_find_by_id(args->playback_id);
if (playback == NULL) {
@@ -51,7 +51,7 @@ void ast_ari_playbacks_get(struct ast_variable *headers,
return;
}
ast_ari_response_ok(response, ast_json_ref(json));
ast_ari_response_ok(response, json);
}
void ast_ari_playbacks_stop(struct ast_variable *headers,
struct ast_ari_playbacks_stop_args *args,

8
res/ari/resource_recordings.c
View File

@@ -76,7 +76,7 @@ void ast_ari_recordings_get_stored(struct ast_variable *headers,
{
RAII_VAR(struct stasis_app_stored_recording *, recording, NULL,
ao2_cleanup);
RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
struct ast_json *json;
recording = stasis_app_stored_recording_find_by_name(
args->recording_name);
@@ -93,7 +93,7 @@ void ast_ari_recordings_get_stored(struct ast_variable *headers,
return;
}
ast_ari_response_ok(response, ast_json_ref(json));
ast_ari_response_ok(response, json);
}
void ast_ari_recordings_delete_stored(struct ast_variable *headers,
@@ -142,7 +142,7 @@ void ast_ari_recordings_get_live(struct ast_variable *headers,
struct ast_ari_response *response)
{
RAII_VAR(struct stasis_app_recording *, recording, NULL, ao2_cleanup);
RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
struct ast_json *json;
recording = stasis_app_recording_find_by_name(args->recording_name);
if (recording == NULL) {
@@ -158,7 +158,7 @@ void ast_ari_recordings_get_live(struct ast_variable *headers,
return;
}
ast_ari_response_ok(response, ast_json_ref(json));
ast_ari_response_ok(response, json);
}
static void control_recording(const char *name,