commit 74b12eb85896adf8bdcf2f8c3ae7d72d8510aeb6
author Mike Kruskal <62662355+mkruskal-google@users.noreply.github.com> Tue May 09 08:51:18 2023 -0700
committer GitHub <noreply@github.com> Tue May 09 08:51:18 2023 -0700
tree fe8a0de496130dc7c84ddcea262a7eee9fb2eb8f
parent 040a7cf6cc169f50d65c8549b31e4b60fafe16a1
parent afa997d343b52365665705b80f6878b85a90044d

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

Fix crash in #12104 (cherry-pick)

src/google/protobuf/wire_format.h

diff --git a/src/google/protobuf/wire_format.h b/src/google/protobuf/wire_format.h
index dec6774..b1b42a9 100644
--- a/src/google/protobuf/wire_format.h
+++ b/src/google/protobuf/wire_format.h
@@ -357,8 +357,9 @@
 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;