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

res_pjsip_pubsub: Fix multiple leaks on failure to append vectors.

Browse Source 
Change-Id: I68ece0073ea79667ca41eb10405f516f1d30d482
This commit is contained in:
Corey Farrell
2017-11-06 18:58:40 -05:00
parent 637b37fb98
commit 2c4db2a3d5
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
res/res_pjsip_pubsub.c
View File

@@ -938,7 +938,9 @@ static void build_node_children(struct ast_sip_endpoint *endpoint, const struct
} }
ast_debug(2, "Subscription to leaf resource %s resulted in success. Adding to parent %s\n", ast_debug(2, "Subscription to leaf resource %s resulted in success. Adding to parent %s\n",
resource, parent->resource); resource, parent->resource);
AST_VECTOR_APPEND(&parent->children, current); if (AST_VECTOR_APPEND(&parent->children, current)) {
tree_node_destroy(current);
}
} else { } else {
ast_debug(2, "Subscription to leaf resource %s resulted in error response %d\n", ast_debug(2, "Subscription to leaf resource %s resulted in error response %d\n",
resource, resp); resource, resp);
@@ -953,7 +955,9 @@ static void build_node_children(struct ast_sip_endpoint *endpoint, const struct
build_node_children(endpoint, handler, child_list, current, visited); build_node_children(endpoint, handler, child_list, current, visited);
if (AST_VECTOR_SIZE(&current->children) > 0) { if (AST_VECTOR_SIZE(&current->children) > 0) {
ast_debug(1, "List %s had no successful children.\n", resource); ast_debug(1, "List %s had no successful children.\n", resource);
AST_VECTOR_APPEND(&parent->children, current); if (AST_VECTOR_APPEND(&parent->children, current)) {
tree_node_destroy(current);
}
} else { } else {
ast_debug(2, "List %s had successful children. Adding to parent %s\n", ast_debug(2, "List %s had successful children. Adding to parent %s\n",
resource, parent->resource); resource, parent->resource);
@@ -1194,6 +1198,10 @@ static struct ast_sip_subscription *create_virtual_subscriptions(const struct as
if (AST_VECTOR_APPEND(&sub->children, child)) { if (AST_VECTOR_APPEND(&sub->children, child)) {
ast_debug(1, "Child subscription to resource %s could not be appended\n", ast_debug(1, "Child subscription to resource %s could not be appended\n",
child_node->resource); child_node->resource);
destroy_subscription(child);
/* Have to release tree here too because a ref was added
* to child that destroy_subscription() doesn't release. */
ao2_cleanup(tree);
} }
} }
@@ -2139,7 +2147,9 @@ static void build_body_part(pj_pool_t *pool, struct ast_sip_subscription *sub,
bp->part->body = body; bp->part->body = body;
pj_list_insert_before(&bp->part->hdr, bp->cid); pj_list_insert_before(&bp->part->hdr, bp->cid);
AST_VECTOR_APPEND(parts, bp); if (AST_VECTOR_APPEND(parts, bp)) {
ast_free(bp);
}
} }
/*! /*!
@@ -2200,6 +2210,7 @@ static pjsip_msg_body *generate_list_body(pj_pool_t *pool, struct ast_sip_subscr
/* This can happen if issuing partial state and no children of the list have changed state */ /* This can happen if issuing partial state and no children of the list have changed state */
if (AST_VECTOR_SIZE(&body_parts) == 0) { if (AST_VECTOR_SIZE(&body_parts) == 0) {
free_body_parts(&body_parts);
return NULL; return NULL;
} }
@@ -2207,6 +2218,7 @@ static pjsip_msg_body *generate_list_body(pj_pool_t *pool, struct ast_sip_subscr
rlmi_part = build_rlmi_body(pool, sub, &body_parts, use_full_state); rlmi_part = build_rlmi_body(pool, sub, &body_parts, use_full_state);
if (!rlmi_part) { if (!rlmi_part) {
free_body_parts(&body_parts);
return NULL; return NULL;
} }
pjsip_multipart_add_part(pool, multipart, rlmi_part); pjsip_multipart_add_part(pool, multipart, rlmi_part);
@@ -4602,7 +4614,10 @@ static int list_item_handler(const struct aco_option *opt,
ast_log(LOG_WARNING, "Ignoring duplicated list item '%s'\n", item); ast_log(LOG_WARNING, "Ignoring duplicated list item '%s'\n", item);
continue; continue;
} }
if (AST_VECTOR_APPEND(&list->items, ast_strdup(item))) {
item = ast_strdup(item);
if (!item || AST_VECTOR_APPEND(&list->items, item)) {
ast_free(item);
return -1; return -1;
} }
} }
@@ -4738,7 +4753,10 @@ static int populate_list(struct resource_list *list, const char *event, const ch
ast_copy_string(list->event, event, sizeof(list->event)); ast_copy_string(list->event, event, sizeof(list->event));
for (i = 0; i < num_resources; ++i) { for (i = 0; i < num_resources; ++i) {
if (AST_VECTOR_APPEND(&list->items, ast_strdup(resources[i]))) { char *resource = ast_strdup(resources[i]);
if (!resource || AST_VECTOR_APPEND(&list->items, resource)) {
ast_free(resource);
return -1; return -1;
} }
} }