Merge pull request #12725 from acozzette/cherrypick-12104-fix

Fix crash in #12104 (cherry-pick)
protocolbuffers · May 9, 2023 · 74b12eb · 74b12eb
2 parents 040a7cf + afa997d
commit 74b12eb
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/google/protobuf/wire_format.h b/src/google/protobuf/wire_format.h
@@ -357,8 +357,9 @@ inline size_t WireFormat::TagSize(int field_number,
 inline void WireFormat::VerifyUTF8String(const char* data, int size,
                                          WireFormat::Operation op) {
 #ifdef GOOGLE_PROTOBUF_UTF8_VALIDATION_ENABLED
-  WireFormatLite::VerifyUtf8String(
-      data, size, static_cast<WireFormatLite::Operation>(op), nullptr);
+  WireFormatLite::VerifyUtf8String(data, size,
+                                   static_cast<WireFormatLite::Operation>(op),
+                                   /* field_name = */ "");
 #else
   // Avoid the compiler warning about unused variables.
   (void)data;