escape % sign in subsitutionformatter

Signed-off-by: Aidan Hahn <aidanhahn@datawire.io>
envoyproxy · Jan 7, 2022 · 6804b59 · 6804b59
1 parent c5c5d4c
commit 6804b59
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/source/common/formatter/substitution_formatter.cc b/source/common/formatter/substitution_formatter.cc
@@ -2,6 +2,7 @@
 
 #include <algorithm>
 #include <climits>
+#include <cstddef>
 #include <cstdint>
 #include <regex>
 #include <string>
@@ -454,15 +455,15 @@ SubstitutionFormatParser::parse(const std::string& format,
   std::vector<FormatterProviderPtr> formatters;
   const std::regex command_w_args_regex(R"EOF(^%([A-Z]|[0-9]|_)+(\([^\)]*\))?(:[0-9]+)?(%))EOF");
 
-  for (size_t pos = 0; pos < format.length(); ++pos) {
+  for (size_t pos = 0; pos < format.size(); ++pos) {
     if (format[pos] != '%') {
       current_token += format[pos];
       continue;
     }
 
     // escape '%%'
-    if (format.length() > pos+1) {
-      if (format[pos+1] == '%') {
+    if (format.size() > pos + 1) {
+      if (format[pos + 1] == '%') {
         current_token += '%';
         pos++;
         continue;

diff --git a/test/common/formatter/substitution_formatter_test.cc b/test/common/formatter/substitution_formatter_test.cc
@@ -3084,9 +3084,9 @@ TEST(SubstitutionFormatterTest, EscapingFormatParse) {
 
   auto providers = SubstitutionFormatParser::parse("%%");
 
-  EXPECT_EQ(providers.size(), 1);
+  ASSERT_EQ(providers.size(), 1);
   EXPECT_EQ("%", providers[0]->format(request_headers, response_headers, response_trailers,
-                                     stream_info, body));
+                                      stream_info, body));
 }
 
 TEST(SubstitutionFormatterTest, FormatterExtension) {