kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-04 20:25:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip_history: Fix multiple leaks on vector append failure." into 13

Browse Source
This commit is contained in:
Joshua Colp
2017-11-09 03:44:21 -06:00
committed by Gerrit Code Review
parent 88d3773330 cf91dde509
commit 7296d3e5af
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
res/res_pjsip_history.c
View File

@@ -707,10 +707,13 @@ static pj_status_t history_on_tx_msg(pjsip_tx_data *tdata)
pj_sockaddr_cp(&entry->dst, &tdata->tp_info.dst_addr);
ast_mutex_lock(&history_lock);
AST_VECTOR_APPEND(&vector_history, entry);
if (AST_VECTOR_APPEND(&vector_history, entry)) {
ao2_ref(entry, -1);
entry = NULL;
}
ast_mutex_unlock(&history_lock);
if (log_level != -1) {
if (log_level != -1 && entry) {
char line[256];
sprint_list_entry(entry, line, sizeof(line));
@@ -747,10 +750,13 @@ static pj_bool_t history_on_rx_msg(pjsip_rx_data *rdata)
}
ast_mutex_lock(&history_lock);
AST_VECTOR_APPEND(&vector_history, entry);
if (AST_VECTOR_APPEND(&vector_history, entry)) {
ao2_ref(entry, -1);
entry = NULL;
}
ast_mutex_unlock(&history_lock);
if (log_level != -1) {
if (log_level != -1 && entry) {
char line[256];
sprint_list_entry(entry, line, sizeof(line));
@@ -961,7 +967,9 @@ static int evaluate_history_entry(struct pjsip_history_entry *entry, struct expr
/* If this is not an operator, push it to the stack */
if (!it_queue->op) {
AST_VECTOR_APPEND(&stack, it_queue);
if (AST_VECTOR_APPEND(&stack, it_queue)) {
goto error;
}
continue;
}
@@ -1037,7 +1045,11 @@ static int evaluate_history_entry(struct pjsip_history_entry *entry, struct expr
if (!result) {
goto error;
}
AST_VECTOR_APPEND(&stack, result);
if (AST_VECTOR_APPEND(&stack, result)) {
expression_token_free(result);
goto error;
}
}
/*
@@ -1058,6 +1070,7 @@ static int evaluate_history_entry(struct pjsip_history_entry *entry, struct expr
}
result = final->result;
ast_free(final);
AST_VECTOR_FREE(&stack);
return result;
@@ -1100,6 +1113,7 @@ static struct vector_history_t *filter_history(struct ast_cli_args *a)
queue = build_expression_queue(a);
if (!queue) {
AST_VECTOR_PTR_FREE(output);
return NULL;
}
@@ -1120,7 +1134,9 @@ static struct vector_history_t *filter_history(struct ast_cli_args *a)
} else if (!res) {
continue;
} else {
AST_VECTOR_APPEND(output, ao2_bump(entry));
if (AST_VECTOR_APPEND(output, ao2_bump(entry))) {
ao2_cleanup(entry);
}
}
}
ast_mutex_unlock(&history_lock);