Add a DCHECK that ArenaStringPtr::Set(char*, Arena*) is not called with

derekmauro · copybara-github · commit 95b1763938b8 · 2025-07-25T11:27:08.000-07:00
a null char* argument.

This is already undefined behavior since the argument is immediately
used to construct a string_view, and passing a null argument to the
single-arg string_view constructor is undefined behavior. Adding the
check will prevent introduction of new bugs when using standard
library implementations that do not detect this case.

PiperOrigin-RevId: 787178436
diff --git a/src/google/protobuf/arenastring.h b/src/google/protobuf/arenastring.h
@@ -462,6 +462,7 @@ inline void ArenaStringPtr::InitAllocated(std::string* str, Arena* arena) {
 }
 
 inline void ArenaStringPtr::Set(const char* s, Arena* arena) {
+  ABSL_DCHECK(s != nullptr);
   Set(absl::string_view{s}, arena);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -462,6 +462,7 @@ inline void ArenaStringPtr::InitAllocated(std::string* str, Arena* arena) {`
`462`	`462`	`}`
`463`	`463`
`464`	`464`	`inline void ArenaStringPtr::Set(const char* s, Arena* arena) {`
	`465`	`+ ABSL_DCHECK(s != nullptr);`
`465`	`466`	`Set(absl::string_view{s}, arena);`
`466`	`467`	`}`
`467`	`468`