commit 42070a017d87db5156bd9e94db8114e2467e8a2a
author Robert <robert.a.hilton.jr@gmail.com> Mon Oct 14 09:36:20 2024 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Oct 14 09:49:24 2024 -0700
tree f861904800f008e2fe162d2493aa385564c389c0
parent 8f6a7a2ceba6792b2b5d6fb01888f177a09afe35

Fix a warning from uninitialized variables (#17052)

Currently, when a project that includes protobuf is compiled using -Werror, the build will fail due to these variables not being initialized. This fixes this warning allowing the build to complete successfully

Closes #17052

COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/17052 from guitar24t:main a0d295c222ac62149a498f97ce9cd6bb55fa3884
PiperOrigin-RevId: 685735896

src/google/protobuf/thread_safe_arena.h

diff --git a/src/google/protobuf/thread_safe_arena.h b/src/google/protobuf/thread_safe_arena.h
index 2065ee9..646bb4e 100644
--- a/src/google/protobuf/thread_safe_arena.h
+++ b/src/google/protobuf/thread_safe_arena.h
@@ -76,7 +76,7 @@
   }
 
   void ReturnArrayMemory(void* p, size_t size) {
-    SerialArena* arena;
+    SerialArena* arena = nullptr;
     if (PROTOBUF_PREDICT_TRUE(GetSerialArenaFast(&arena))) {
       arena->ReturnArrayMemory(p, size);
     }
@@ -88,7 +88,7 @@
   // have fallback function calls in tail position. This substantially improves
   // code for the happy path.
   PROTOBUF_NDEBUG_INLINE bool MaybeAllocateAligned(size_t n, void** out) {
-    SerialArena* arena;
+    SerialArena* arena = nullptr;
     if (PROTOBUF_PREDICT_TRUE(GetSerialArenaFast(&arena))) {
       return arena->MaybeAllocateAligned(n, out);
     }