From eb8a34d22dc10847ea1ef4ae1da88b480fa7f3c3 Mon Sep 17 00:00:00 2001
From: Protobuf Team Bot <protobuf-github-bot@google.com>
Date: Tue, 3 Dec 2024 10:11:08 -0800
Subject: [PATCH] Fix issue where a tmp buffer could have been too small when
 handling a serialized FeatureSet.

Rename upb_Log2CeilingSize() to upb_RoundUpToPowerOfTwo() to minimize the chance of this confusion happening in the future.

In practice this condition could never be hit by descriptors generated by protoc since FeatureSet is small and 1-byte-on-wire fields.

PiperOrigin-RevId: 702381123
---
 upb/base/internal/log2.h                | 4 +++-
 upb/message/internal/message.c          | 4 ++--
 upb/message/map_sorter.c                | 2 +-
 upb/mini_descriptor/internal/encode.hpp | 2 +-
 upb/reflection/internal/def_builder.c   | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/upb/base/internal/log2.h b/upb/base/internal/log2.h
index 486e3b0e3597..04736da84d89 100644
--- a/upb/base/internal/log2.h
+++ b/upb/base/internal/log2.h
@@ -27,7 +27,9 @@ UPB_INLINE int upb_Log2Ceiling(int x) {
 #endif
 }
 
-UPB_INLINE int upb_Log2CeilingSize(int x) { return 1 << upb_Log2Ceiling(x); }
+UPB_INLINE int upb_RoundUpToPowerOfTwo(int x) {
+  return 1 << upb_Log2Ceiling(x);
+}
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/upb/message/internal/message.c b/upb/message/internal/message.c
index 1ba26df582db..8c2b1e58c3da 100644
--- a/upb/message/internal/message.c
+++ b/upb/message/internal/message.c
@@ -55,7 +55,7 @@ bool UPB_PRIVATE(_upb_Message_EnsureAvailable)(struct upb_Message* msg,
   upb_Message_Internal* in = UPB_PRIVATE(_upb_Message_GetInternal)(msg);
   if (!in) {
     // No internal data, allocate from scratch.
-    size_t size = UPB_MAX(128, upb_Log2CeilingSize(need + overhead));
+    size_t size = UPB_MAX(128, upb_RoundUpToPowerOfTwo(need + overhead));
     in = upb_Arena_Malloc(a, size);
     if (!in) return false;
 
@@ -65,7 +65,7 @@ bool UPB_PRIVATE(_upb_Message_EnsureAvailable)(struct upb_Message* msg,
     UPB_PRIVATE(_upb_Message_SetInternal)(msg, in);
   } else if (in->ext_begin - in->unknown_end < need) {
     // Internal data is too small, reallocate.
-    size_t new_size = upb_Log2CeilingSize(in->size + need);
+    size_t new_size = upb_RoundUpToPowerOfTwo(in->size + need);
     size_t ext_bytes = in->size - in->ext_begin;
     size_t new_ext_begin = new_size - ext_bytes;
     in = upb_Arena_Realloc(a, in, in->size, new_size);
diff --git a/upb/message/map_sorter.c b/upb/message/map_sorter.c
index f0836ca63e4f..029eabc5ee5e 100644
--- a/upb/message/map_sorter.c
+++ b/upb/message/map_sorter.c
@@ -101,7 +101,7 @@ static bool _upb_mapsorter_resize(_upb_mapsorter* s, _upb_sortedmap* sorted,
 
   if (sorted->end > s->cap) {
     const int oldsize = s->cap * sizeof(*s->entries);
-    s->cap = upb_Log2CeilingSize(sorted->end);
+    s->cap = upb_RoundUpToPowerOfTwo(sorted->end);
     const int newsize = s->cap * sizeof(*s->entries);
     s->entries = upb_grealloc(s->entries, oldsize, newsize);
     if (!s->entries) return false;
diff --git a/upb/mini_descriptor/internal/encode.hpp b/upb/mini_descriptor/internal/encode.hpp
index cfa3bed6cc00..8f81edae4b33 100644
--- a/upb/mini_descriptor/internal/encode.hpp
+++ b/upb/mini_descriptor/internal/encode.hpp
@@ -97,7 +97,7 @@ class MtDataEncoder {
       if (!end) return false;
       // C++ does not guarantee that string has doubling growth behavior, but
       // we need it to avoid O(n^2).
-      str_.reserve(upb_Log2CeilingSize(str_.size() + (end - buf_)));
+      str_.reserve(upb_RoundUpToPowerOfTwo(str_.size() + (end - buf_)));
       str_.append(buf_, end - buf_);
       return true;
     }
diff --git a/upb/reflection/internal/def_builder.c b/upb/reflection/internal/def_builder.c
index 7e560177253b..f8e1deb6c089 100644
--- a/upb/reflection/internal/def_builder.c
+++ b/upb/reflection/internal/def_builder.c
@@ -350,7 +350,7 @@ upb_StringView _upb_DefBuilder_MakeKey(upb_DefBuilder* ctx,
                                        upb_StringView key) {
   size_t need = key.size + sizeof(void*);
   if (ctx->tmp_buf_size < need) {
-    ctx->tmp_buf_size = UPB_MAX(64, upb_Log2Ceiling(need));
+    ctx->tmp_buf_size = UPB_MAX(64, upb_RoundUpToPowerOfTwo(need));
     ctx->tmp_buf = upb_Arena_Malloc(ctx->tmp_arena, ctx->tmp_buf_size);
     if (!ctx->tmp_buf) _upb_DefBuilder_OomErr(ctx);
   }