diff options
| author | Scott Griepentrog <scott@griepentrog.com> | 2016-03-02 11:17:54 -0600 |
|---|---|---|
| committer | Scott Griepentrog <sgriepentrog@digium.com> | 2016-03-02 12:00:37 -0600 |
| commit | 1ea7a5a774ee7c70325e1be37afb403dac1abbc3 (patch) | |
| tree | 167f6ca70ff2cca6511b9ac6d1ddc095da6e0e0c /main/message.c | |
| parent | d1495bc0ebed86d322488bed647b43aba0ae9b1f (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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/message.c b/main/message.c index 01a1c9b1c..c15975b63 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) |