kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 19:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

CHAOS: cleanup possible null vars on msg alloc failure

Browse Source 
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
This commit is contained in:
Scott Griepentrog
2016-03-02 11:17:54 -06:00
committed by Scott Griepentrog
parent d1495bc0eb
commit 1ea7a5a774
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/message.c
View File

@@ -398,7 +398,7 @@ static void msg_destructor(void *obj)
struct ast_msg *msg = obj; struct ast_msg *msg = obj;
ast_string_field_free_memory(msg); ast_string_field_free_memory(msg);
ao2_ref(msg->vars, -1); ao2_cleanup(msg->vars);
} }
struct ast_msg *ast_msg_alloc(void) struct ast_msg *ast_msg_alloc(void)

2
res/res_pjsip_messaging.c
View File

@@ -597,7 +597,7 @@ static int sip_msg_send(const struct ast_msg *msg, const char *to, const char *f
if (!(mdata = msg_data_create(msg, to, from)) || if (!(mdata = msg_data_create(msg, to, from)) ||
ast_sip_push_task(message_serializer, msg_send, mdata)) { ast_sip_push_task(message_serializer, msg_send, mdata)) {
ao2_ref(mdata, -1); ao2_cleanup(mdata);
return -1; return -1;
} }
return 0; return 0;