Skip to content

Fix memory leak when sending initial metadata in gRPC callouts. #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 15, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions proxy_wasm_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -1341,9 +1341,12 @@ inline WasmResult grpcCall(std::string_view service, std::string_view service_na
void *metadata_ptr = nullptr;
size_t metadata_size = 0;
MakeHeaderStringPairsBuffer(initial_metadata, &metadata_ptr, &metadata_size);
return proxy_grpc_call(service.data(), service.size(), service_name.data(), service_name.size(),
method_name.data(), method_name.size(), metadata_ptr, metadata_size,
request.data(), request.size(), timeout_milliseconds, token_ptr);
WasmResult result =
proxy_grpc_call(service.data(), service.size(), service_name.data(), service_name.size(),
method_name.data(), method_name.size(), metadata_ptr, metadata_size,
request.data(), request.size(), timeout_milliseconds, token_ptr);
::free(metadata_ptr);
return result;
}

#ifdef PROXY_WASM_PROTOBUF
Expand All @@ -1366,9 +1369,11 @@ inline WasmResult grpcStream(std::string_view service, std::string_view service_
void *metadata_ptr = nullptr;
size_t metadata_size = 0;
MakeHeaderStringPairsBuffer(initial_metadata, &metadata_ptr, &metadata_size);
return proxy_grpc_stream(service.data(), service.size(), service_name.data(), service_name.size(),
method_name.data(), method_name.size(), metadata_ptr, metadata_size,
token_ptr);
WasmResult result = proxy_grpc_stream(service.data(), service.size(), service_name.data(),
service_name.size(), method_name.data(), method_name.size(),
metadata_ptr, metadata_size, token_ptr);
::free(metadata_ptr);
return result;
}

inline WasmResult grpcCancel(uint32_t token) { return proxy_grpc_cancel(token); }
Expand Down