Skip to content
Snippets Groups Projects
Commit e6432bf3 authored by Noah Eisen's avatar Noah Eisen
Browse files

Fix leak if duplicated static md

parent 686437ad
No related branches found
No related tags found
No related merge requests found
...@@ -823,7 +823,7 @@ uint32_t grpc_call_test_only_get_encodings_accepted_by_peer(grpc_call *call) { ...@@ -823,7 +823,7 @@ uint32_t grpc_call_test_only_get_encodings_accepted_by_peer(grpc_call *call) {
return encodings_accepted_by_peer; return encodings_accepted_by_peer;
} }
static grpc_linked_mdelem *linked_from_md(grpc_metadata *md) { static grpc_linked_mdelem *linked_from_md(const grpc_metadata *md) {
return (grpc_linked_mdelem *)&md->internal_data; return (grpc_linked_mdelem *)&md->internal_data;
} }
...@@ -847,7 +847,7 @@ static int prepare_application_metadata( ...@@ -847,7 +847,7 @@ static int prepare_application_metadata(
for (i = 0; i < total_count; i++) { for (i = 0; i < total_count; i++) {
const grpc_metadata *md = const grpc_metadata *md =
get_md_elem(metadata, additional_metadata, i, count); get_md_elem(metadata, additional_metadata, i, count);
grpc_linked_mdelem *l = (grpc_linked_mdelem *)&md->internal_data; grpc_linked_mdelem *l = linked_from_md(md);
GPR_ASSERT(sizeof(grpc_linked_mdelem) == sizeof(md->internal_data)); GPR_ASSERT(sizeof(grpc_linked_mdelem) == sizeof(md->internal_data));
if (!GRPC_LOG_IF_ERROR("validate_metadata", if (!GRPC_LOG_IF_ERROR("validate_metadata",
grpc_validate_header_key_is_legal(md->key))) { grpc_validate_header_key_is_legal(md->key))) {
...@@ -864,7 +864,7 @@ static int prepare_application_metadata( ...@@ -864,7 +864,7 @@ static int prepare_application_metadata(
for (int j = 0; j < i; j++) { for (int j = 0; j < i; j++) {
const grpc_metadata *md = const grpc_metadata *md =
get_md_elem(metadata, additional_metadata, j, count); get_md_elem(metadata, additional_metadata, j, count);
grpc_linked_mdelem *l = (grpc_linked_mdelem *)&md->internal_data; grpc_linked_mdelem *l = linked_from_md(md);
GRPC_MDELEM_UNREF(exec_ctx, l->md); GRPC_MDELEM_UNREF(exec_ctx, l->md);
} }
return 0; return 0;
...@@ -882,9 +882,12 @@ static int prepare_application_metadata( ...@@ -882,9 +882,12 @@ static int prepare_application_metadata(
} }
for (i = 0; i < total_count; i++) { for (i = 0; i < total_count; i++) {
grpc_metadata *md = get_md_elem(metadata, additional_metadata, i, count); grpc_metadata *md = get_md_elem(metadata, additional_metadata, i, count);
GRPC_LOG_IF_ERROR( grpc_linked_mdelem *l = linked_from_md(md);
"prepare_application_metadata", grpc_error *error = grpc_metadata_batch_link_tail(exec_ctx, batch, l);
grpc_metadata_batch_link_tail(exec_ctx, batch, linked_from_md(md))); if (error != GRPC_ERROR_NONE) {
GRPC_MDELEM_UNREF(exec_ctx, l->md);
}
GRPC_LOG_IF_ERROR("prepare_application_metadata", error);
} }
call->send_extra_metadata_count = 0; call->send_extra_metadata_count = 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment