Skip to content

Use safe_malloc instead of new when creating new_envoy_map_entry #2632

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.

Sign up for GitHub

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
RyanTheOptimist merged 4 commits into from
Oct 31, 2022
Merged

Use safe_malloc instead of new when creating new_envoy_map_entry #2632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca26f3a
use safe_malloc instead of new when creating new_envoy_map_entry sinc…
RyanTheOptimist Oct 24, 2022
fce15a1
use safe_malloc instead of new when creating new_envoy_map_entry sinc…
RyanTheOptimist Oct 24, 2022
cb85082
Cleanup tests
RyanTheOptimist Oct 25, 2022
2007b4d
Merge branch 'main' into new_envoy_map_entry
RyanTheOptimist Oct 31, 2022
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
3 changes: 2 additions & 1 deletion library/common/bridge/utility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ envoy_error_code_t errorCodeFromLocalStatus(Http::Code status);
template <class T> envoy_map makeEnvoyMap(const T& map) {
envoy_map new_map;
new_map.length = std::size(map);
new_map.entries = new envoy_map_entry[std::size(map)];
new_map.entries =
static_cast<envoy_map_entry*>(safe_malloc(sizeof(envoy_map_entry) * std::size(map)));

uint64_t i = 0;
for (const auto& e : map) {
Expand Down
1 change: 1 addition & 0 deletions test/common/http/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ envoy_cc_test(
srcs = ["header_utility_test.cc"],
repository = "@envoy",
deps = [
"//library/common/bridge:utility_lib",
"//library/common/data:utility_lib",
"//library/common/http:header_utility_lib",
"//library/common/types:c_types_lib",
Expand Down
28 changes: 15 additions & 13 deletions test/common/http/header_utility_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "source/common/http/header_map_impl.h"

#include "gtest/gtest.h"
#include "library/common/bridge/utility.h"
#include "library/common/data/utility.h"
#include "library/common/http/header_utility.h"
#include "library/common/types/c_types.h"
Expand All @@ -18,17 +19,17 @@ envoy_data envoyTestString(std::string& s, uint32_t* sentinel) {
}

TEST(RequestHeaderDataConstructorTest, FromCToCppEmpty) {
envoy_map_entry* header_array = new envoy_map_entry[0];
envoy_headers empty_headers = {0, header_array};
std::map<std::string, std::string> empty_map;
envoy_headers empty_headers = Bridge::Utility::makeEnvoyMap(empty_map);

RequestHeaderMapPtr cpp_headers = Utility::toRequestHeaders(empty_headers);

ASSERT_TRUE(cpp_headers->empty());
}

TEST(RequestTrailerDataConstructorTest, FromCToCppEmpty) {
envoy_map_entry* header_array = new envoy_map_entry[0];
envoy_headers empty_trailers = {0, header_array};
std::map<std::string, std::string> empty_map;
envoy_headers empty_trailers = Bridge::Utility::makeEnvoyMap(empty_map);

RequestTrailerMapPtr cpp_trailers = Utility::toRequestTrailers(empty_trailers);

Expand All @@ -40,7 +41,8 @@ TEST(RequestHeaderDataConstructorTest, FromCToCpp) {
std::vector<std::pair<std::string, std::string>> headers = {
{":method", "GET"}, {":scheme", "https"}, {":authority", "api.lyft.com"}, {":path", "/ping"}};

envoy_map_entry* header_array = new envoy_map_entry[headers.size()];
envoy_map_entry* header_array =
static_cast<envoy_map_entry*>(safe_malloc(sizeof(envoy_map_entry) * headers.size()));

uint32_t* sentinel = new uint32_t;
*sentinel = 0;
Expand Down Expand Up @@ -81,7 +83,8 @@ TEST(RequestTrailerDataConstructorTest, FromCToCpp) {
std::vector<std::pair<std::string, std::string>> trailers = {
{"processing-duration-ms", "25"}, {"response-compression-ratio", "0.61"}};

envoy_map_entry* header_array = new envoy_map_entry[trailers.size()];
envoy_map_entry* header_array =
static_cast<envoy_map_entry*>(safe_malloc(sizeof(envoy_map_entry) * trailers.size()));

uint32_t* sentinel = new uint32_t;
*sentinel = 0;
Expand All @@ -105,9 +108,8 @@ TEST(RequestTrailerDataConstructorTest, FromCToCpp) {
ASSERT_EQ(cpp_trailers->size(), c_trailers_copy.length);

for (envoy_map_size_t i = 0; i < c_trailers_copy.length; i++) {
auto expected_key =
LowerCaseString(Data::Utility::copyToString(c_trailers_copy.entries[i].key));
auto expected_value = Data::Utility::copyToString(c_trailers_copy.entries[i].value);
LowerCaseString expected_key(Data::Utility::copyToString(c_trailers_copy.entries[i].key));
std::string expected_value = Data::Utility::copyToString(c_trailers_copy.entries[i].value);

// Key is present.
EXPECT_FALSE(cpp_trailers->get(expected_key).empty());
Expand Down Expand Up @@ -137,8 +139,8 @@ TEST(HeaderDataConstructorTest, FromCppToC) {
ASSERT_EQ(c_headers.length, static_cast<envoy_map_size_t>(cpp_headers->size()));

for (envoy_map_size_t i = 0; i < c_headers.length; i++) {
auto actual_key = LowerCaseString(Data::Utility::copyToString(c_headers.entries[i].key));
auto actual_value = Data::Utility::copyToString(c_headers.entries[i].value);
LowerCaseString actual_key(Data::Utility::copyToString(c_headers.entries[i].key));
std::string actual_value = Data::Utility::copyToString(c_headers.entries[i].value);

// Key is present.
EXPECT_FALSE(cpp_headers->get(actual_key).empty());
Expand All @@ -162,8 +164,8 @@ TEST(HeaderDataConstructorTest, FromCppToCWithAlpn) {
ASSERT_EQ(c_headers.length, static_cast<envoy_map_size_t>(cpp_headers->size()));

for (envoy_map_size_t i = 0; i < c_headers.length; i++) {
auto actual_key = LowerCaseString(Data::Utility::copyToString(c_headers.entries[i].key));
auto actual_value = Data::Utility::copyToString(c_headers.entries[i].value);
LowerCaseString actual_key(Data::Utility::copyToString(c_headers.entries[i].key));
std::string actual_value = Data::Utility::copyToString(c_headers.entries[i].value);

// Key is present.
EXPECT_FALSE(cpp_headers->get(actual_key).empty());
Expand Down