commit e275be2830b5c215beb0a9150fc7d9170d8c65ec
author Protobuf Team Bot <protobuf-github-bot@google.com> Mon Apr 10 18:43:19 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Apr 10 18:44:01 2023 -0700
tree dc50d1d2a07a3df8f0fce442b1f97746c48aba9d
parent df93cf65a2957bd0921462cb9d055c5b82a6d68b

Guard deep copy sub table check from other uses of submsg_index.
When copying array items only access and pass sub table if field type is message.

PiperOrigin-RevId: 523268010

upb/message/copy.c

diff --git a/upb/message/copy.c b/upb/message/copy.c
index 3f2c607..7fc0795 100644
--- a/upb/message/copy.c
+++ b/upb/message/copy.c
@@ -149,7 +149,7 @@
   if (!_upb_Array_ResizeUninitialized(cloned_array, size, arena)) {
     return NULL;
   }
-  for (int i = 0; i < size; ++i) {
+  for (size_t i = 0; i < size; ++i) {
     upb_MessageValue val = upb_Array_Get(array, i);
     if (!upb_Clone_MessageValue(&val, value_type, sub, arena)) {
       return false;
@@ -166,7 +166,8 @@
   _upb_MiniTableField_CheckIsArray(field);
   upb_Array* cloned_array = upb_Array_DeepClone(
       array, upb_MiniTableField_CType(field),
-      field->UPB_PRIVATE(submsg_index) != kUpb_NoSub
+      upb_MiniTableField_CType(field) == kUpb_CType_Message &&
+              field->UPB_PRIVATE(submsg_index) != kUpb_NoSub
           ? upb_MiniTable_GetSubMessageTable(mini_table, field)
           : NULL,
       arena);