From 5de386388498c1e63e8ccfaa21a12f26d19b4b7c Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Sat, 21 Sep 2013 00:22:30 +0000 Subject: [PATCH] app_queue: Fix json blob ref leak. The json ref from queue_member_blob_create() was never released. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@399583 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_queue.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/apps/app_queue.c b/apps/app_queue.c index cfec634fac..0dd820bea4 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -1952,12 +1952,29 @@ static void queue_publish_multi_channel_blob(struct ast_channel *caller, struct agent_snapshot, type, blob); } +/*! + * \internal + * \brief Publish the member blob. + * \since 12.0.0 + * + * \param type Stasis message type to publish. + * \param blob The information being published. + * + * \note The json blob reference is passed to this function. + * + * \return Nothing + */ static void queue_publish_member_blob(struct stasis_message_type *type, struct ast_json *blob) { RAII_VAR(struct ast_json_payload *, payload, NULL, ao2_cleanup); RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup); + if (!blob) { + return; + } + payload = ast_json_payload_create(blob); + ast_json_unref(blob); if (!payload) { return; } @@ -6729,7 +6746,8 @@ static int add_to_queue(const char *queuename, const char *interface, const char return res; } -static int publish_queue_member_pause(struct call_queue *q, struct member *member, const char *reason) { +static int publish_queue_member_pause(struct call_queue *q, struct member *member, const char *reason) +{ struct ast_json *json_blob = queue_member_blob_create(q, member); if (!json_blob) { -- 2.47.2