kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

VECTOR: Passing parameters with side effects to macros is dangerous.

Browse Source 
* Fix several instances where we were bumping a ref in the parameter and
then unrefing the object if it failed.  The way the AST_VECTOR_APPEND()
and AST_VECTOR_REPLACE() macros are implemented means if it fails the new
value was never evaluated.

Change-Id: I2847872a455b11ea7e5b7ce697c0a455a1d0ac9a
This commit is contained in:
Richard Mudgett
2018-06-21 16:39:45 -05:00
parent 498e775a4a
commit cb9475eb3d
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/res_pjsip/pjsip_options.c
View File

@@ -1530,10 +1530,11 @@ static int sip_options_endpoint_compositor_add_task(void *obj)
ast_debug(3, "Adding endpoint compositor '%s' to AOR '%s'\n",
task_data->endpoint_state_compositor->name, task_data->aor_options->name);
ao2_ref(task_data->endpoint_state_compositor, +1);
if (AST_VECTOR_APPEND(&task_data->aor_options->compositors,
ao2_bump(task_data->endpoint_state_compositor))) {
task_data->endpoint_state_compositor)) {
/* Failed to add so no need to update the endpoint status. Nothing changed. */
ao2_cleanup(task_data->endpoint_state_compositor);
ao2_ref(task_data->endpoint_state_compositor, -1);
return 0;
}

3
res/res_pjsip_history.c
View File

@@ -1135,7 +1135,8 @@ static struct vector_history_t *filter_history(struct ast_cli_args *a)
} else if (!res) {
continue;
} else {
if (AST_VECTOR_APPEND(output, ao2_bump(entry))) {
ao2_bump(entry);
if (AST_VECTOR_APPEND(output, entry)) {
ao2_cleanup(entry);
}
}

5
res/stasis/messaging.c
View File

@@ -459,8 +459,9 @@ static struct message_subscription *get_or_create_subscription(struct ast_endpoi
ao2_link(endpoint_subscriptions, sub);
} else {
ast_rwlock_wrlock(&tech_subscriptions_lock);
if (AST_VECTOR_APPEND(&tech_subscriptions, ao2_bump(sub))) {
/* Release the ao2_bump that was for the vector and allocation references. */
ao2_ref(sub, +1);
if (AST_VECTOR_APPEND(&tech_subscriptions, sub)) {
/* Release the refs that were for the vector and the allocation. */
ao2_ref(sub, -2);
sub = NULL;
}