one more test, fixing EXPECT_DEATH macro for asan/tsan

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
envoyproxy · Aug 28, 2018 · 8745ebd · 8745ebd
1 parent f39ec4c
commit 8745ebd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/source/common/http/header_map_impl.cc b/source/common/http/header_map_impl.cc
@@ -93,7 +93,6 @@ void HeaderString::append(const char* data, uint32_t size) {
     type_ = Type::Dynamic;
     const uint64_t new_capacity = newCapacity(string_length_, size);
     if (new_capacity > MinDynamicCapacity) {
-      // TODO(alyssawilk) unit test.
       validateCapacity(new_capacity);
       dynamic_capacity_ = new_capacity;
     } else {

diff --git a/test/common/http/header_map_impl_test.cc b/test/common/http/header_map_impl_test.cc
@@ -709,6 +709,12 @@ TEST(HeaderMapImplTest, TestHeaderLengthChecks) {
   value.setCopy("some;", 5);
   EXPECT_DEATH(value.append(nullptr, std::numeric_limits<uint32_t>::max()),
                "Trying to allocate overly large headers.");
+
+  std::string source("hello");
+  HeaderString reference;
+  reference.setReference(source);
+  EXPECT_DEATH(reference.append(nullptr, std::numeric_limits<uint32_t>::max()),
+               "Trying to allocate overly large headers.");
 }
 
 TEST(HeaderMapImplTest, PseudoHeaderOrder) {

diff --git a/test/common/router/header_formatter_test.cc b/test/common/router/header_formatter_test.cc
@@ -177,8 +177,8 @@ TEST_F(RequestInfoHeaderFormatterTest, UserDefinedHeadersConsideredHarmful) {
 
   Http::TestHeaderMapImpl header_map{{":method", "POST"}};
   NiceMock<Envoy::RequestInfo::MockRequestInfo> request_info;
-  EXPECT_DEATH(req_header_parser->evaluateHeaders(header_map, request_info),
-               "Trying to allocate overly large headers.");
+  EXPECT_DEATH_LOG_TO_STDERR(req_header_parser->evaluateHeaders(header_map, request_info),
+                             "Trying to allocate overly large headers.");
 }
 
 TEST_F(RequestInfoHeaderFormatterTest, TestFormatWithUpstreamMetadataVariableMissingHost) {