commit e92505d8d6bf50c5d44805eb5fe73e9f56484cf4
author Dino Radakovic <dinor@google.com> Tue May 17 15:21:04 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Tue May 17 15:22:17 2022 -0700
tree 15337c58ec034ea36d84701fbda295a2fa9f7616
parent 7d3b4c86928ff7b17b3b881d42355062c23f6b44

Use NullSafeStringView for const char* args to absl::StrCat, treating null pointers as ""
Fixes #1167

PiperOrigin-RevId: 449328725
Change-Id: I813785db77b94efa49eeeff4c93449334c380935

absl/strings/str_cat.h

diff --git a/absl/strings/str_cat.h b/absl/strings/str_cat.h
index 4d228b0..a94bc5d 100644
--- a/absl/strings/str_cat.h
+++ b/absl/strings/str_cat.h
@@ -251,7 +251,8 @@
       const strings_internal::AlphaNumBuffer<size>& buf)
       : piece_(&buf.data[0], buf.size) {}
 
-  AlphaNum(const char* c_str) : piece_(c_str) {}  // NOLINT(runtime/explicit)
+  AlphaNum(const char* c_str)                     // NOLINT(runtime/explicit)
+      : piece_(NullSafeStringView(c_str)) {}      // NOLINT(runtime/explicit)
   AlphaNum(absl::string_view pc) : piece_(pc) {}  // NOLINT(runtime/explicit)
 
   template <typename Allocator>

absl/strings/str_cat_test.cc

diff --git a/absl/strings/str_cat_test.cc b/absl/strings/str_cat_test.cc
index f3770dc..69df250 100644
--- a/absl/strings/str_cat_test.cc
+++ b/absl/strings/str_cat_test.cc
@@ -210,6 +210,11 @@
   EXPECT_EQ(result, "");
 }
 
+TEST(StrCat, NullConstCharPtr) {
+  const char* null = nullptr;
+  EXPECT_EQ(absl::StrCat("mon", null, "key"), "monkey");
+}
+
 // A minimal allocator that uses malloc().
 template <typename T>
 struct Mallocator {