From 0a3f0e85ace6f55fa5826c301ccaac066d24a11f Mon Sep 17 00:00:00 2001 From: Scott Griepentrog Date: Wed, 2 Mar 2016 11:17:54 -0600 Subject: 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 --- main/message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/message.c') 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) -- cgit v1.2.3