commit 1fe463ce71b6acc60b3aef65d51185e3704cac8b
author Protobuf Team Bot <protobuf-github-bot@google.com> Tue Jan 16 14:53:47 2024 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Jan 16 14:55:42 2024 -0800
tree 80d5b3ad65689f8458972145c60105e5c20f1e58
parent dfc275fc1f0c6342be36e8562799dbcfdf21d0f9

Avoid integer-to-pointer cast in protobuf SerialArena

PiperOrigin-RevId: 598966004

src/google/protobuf/serial_arena.h

diff --git a/src/google/protobuf/serial_arena.h b/src/google/protobuf/serial_arena.h
index 311c1dd..c94ea9b 100644
--- a/src/google/protobuf/serial_arena.h
+++ b/src/google/protobuf/serial_arena.h
@@ -223,14 +223,15 @@
     // ret + n may point out of the block bounds, or ret may be nullptr.
     // Both computations have undefined behavior when done on pointers,
     // so do them on uintptr_t instead.
-    uintptr_t next = reinterpret_cast<uintptr_t>(ret) + n;
-    if (PROTOBUF_PREDICT_FALSE(next > reinterpret_cast<uintptr_t>(limit_))) {
+    if (PROTOBUF_PREDICT_FALSE(reinterpret_cast<uintptr_t>(ret) + n >
+                               reinterpret_cast<uintptr_t>(limit_))) {
       return false;
     }
     PROTOBUF_UNPOISON_MEMORY_REGION(ret, n);
     *out = ret;
-    set_ptr(reinterpret_cast<char*>(next));
-    MaybePrefetchForwards(reinterpret_cast<char*>(next));
+    char* next = ret + n;
+    set_ptr(next);
+    MaybePrefetchForwards(next);
     return true;
   }
 
@@ -248,16 +249,17 @@
     n = ArenaAlignDefault::Ceil(n);
     char* ret = ArenaAlignAs(align).CeilDefaultAligned(ptr());
     // See the comment in MaybeAllocateAligned re uintptr_t.
-    uintptr_t next = reinterpret_cast<uintptr_t>(ret) + n;
-    if (PROTOBUF_PREDICT_FALSE(next + cleanup::Size(destructor) >
+    if (PROTOBUF_PREDICT_FALSE(reinterpret_cast<uintptr_t>(ret) + n +
+                                   cleanup::Size(destructor) >
                                reinterpret_cast<uintptr_t>(limit_))) {
       return AllocateAlignedWithCleanupFallback(n, align, destructor);
     }
     PROTOBUF_UNPOISON_MEMORY_REGION(ret, n);
-    set_ptr(reinterpret_cast<char*>(next));
+    char* next = ret + n;
+    set_ptr(next);
     AddCleanupFromExisting(ret, destructor);
     ABSL_DCHECK_GE(limit_, ptr());
-    MaybePrefetchForwards(reinterpret_cast<char*>(next));
+    MaybePrefetchForwards(next);
     return ret;
   }