summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2017-11-07 15:59:42 -0600
committerGerrit Code Review <gerrit2@gerrit.digium.api>2017-11-07 15:59:42 -0600
commit0553ee1b9e5c721d83f3495c99adea77d3142aec (patch)
tree2f1684f5c274ed7ac6197b9a19774ba06c602313
parentafc53cbe1c630a7fd3b8531f9b7ec9a95b3f04a2 (diff)
parent67ac6812eec544b8e77d5aeb7b6743a2164d405e (diff)
Merge "res_ari_events: Fix use after free / double-free of JSON message." into 15
-rw-r--r--res/ari/resource_events.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/res/ari/resource_events.c b/res/ari/resource_events.c
index 4be5d0223..992c562a7 100644
--- a/res/ari/resource_events.c
+++ b/res/ari/resource_events.c
@@ -108,7 +108,9 @@ static void stasis_app_message_handler(
msg_application);
} else if (!session->ws_session) {
/* If the websocket is NULL, the message goes to the queue */
- AST_VECTOR_APPEND(&session->message_queue, message);
+ if (!AST_VECTOR_APPEND(&session->message_queue, message)) {
+ ast_json_ref(message);
+ }
ast_log(LOG_WARNING,
"Queued '%s' message for Stasis app '%s'; websocket is not ready\n",
msg_type,