summaryrefslogtreecommitdiff
path: root/main/message.c
diff options
context:
space:
mode:
authorScott Griepentrog <scott@griepentrog.com>2016-03-02 11:17:54 -0600
committerScott Griepentrog <scott@griepentrog.com>2016-03-02 11:56:51 -0600
commit0a3f0e85ace6f55fa5826c301ccaac066d24a11f (patch)
tree43bf03394722e99973c214ef6586db05513b94c4 /main/message.c
parentd0b26c3133e831e915990fd806257d9ef07c508b (diff)
CHAOS: cleanup possible null vars on msg alloc failure
In message.c, if msg_alloc fails to init the string field, vars may be null, so use a null tolerant cleanup. In res_pjsip_messaging.c, if msg_data_create fails, mdata will be null, so use a null tolerant cleanup. ASTERISK-25323 Change-Id: Ic2d55c2c3750d5616e2a05ea92a19c717507ff56
Diffstat (limited to 'main/message.c')
-rw-r--r--main/message.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/message.c b/main/message.c
index 7098f698d..54c604c47 100644
--- a/main/message.c
+++ b/main/message.c
@@ -398,7 +398,7 @@ static void msg_destructor(void *obj)
struct ast_msg *msg = obj;
ast_string_field_free_memory(msg);
- ao2_ref(msg->vars, -1);
+ ao2_cleanup(msg->vars);
}
struct ast_msg *ast_msg_alloc(void)