google-protobuf 4.36.2-x86_64-linux-gnu → 4.37.0.rc.1-x86_64-linux-gnu

data/ext/google/protobuf_c/repeated_field.c

@@ -68,6 +68,7 @@ VALUE RepeatedField_EmptyFrozen(const upb_FieldDef* f) {
     self->arena = Arena_new();
     TypeInfo type_info = TypeInfo_get(f);
     self->array = upb_Array_New(Arena_get(self->arena), type_info.type);
+    if (!self->array) Arena_raise_oom();
     self->type_info = type_info;
     if (self->type_info.type == kUpb_CType_Message) {
       self->type_class = Descriptor_DefToClass(type_info.def.msgdef);
@@ -108,6 +109,7 @@ VALUE RepeatedField_GetRubyWrapper(const upb_Array* array, TypeInfo type_info,
 static VALUE RepeatedField_new_this_type(RepeatedField* from) {
   VALUE arena_rb = Arena_new();
   upb_Array* array = upb_Array_New(Arena_get(arena_rb), from->type_info.type);
+  if (!array) Arena_raise_oom();
   VALUE ret = RepeatedField_GetRubyWrapper(array, from->type_info, arena_rb);
   PBRUBY_ASSERT(ruby_to_RepeatedField(ret)->type_class == from->type_class);
   return ret;
@@ -138,7 +140,9 @@ VALUE RepeatedField_deep_copy(VALUE _self) {
   upb_Arena* arena = Arena_get(arena_rb);
   size_t elements = upb_Array_Size(self->array);
 
-  upb_Array_Resize(new_array, elements, arena);
+  if (!upb_Array_Resize(new_array, elements, arena)) {
+    Arena_raise_oom();
+  }
 
   size_t size = upb_Array_Size(self->array);
   for (size_t i = 0; i < size; i++) {
@@ -216,10 +220,10 @@ static VALUE RepeatedField_subarray(RepeatedField* self, long beg, long len) {
  */
 static VALUE RepeatedField_each(VALUE _self) {
   RepeatedField* self = ruby_to_RepeatedField(_self);
-  int size = upb_Array_Size(self->array);
-  int i;
 
-  for (i = 0; i < size; i++) {
+  // The size is re-read every iteration: the block can clear or shrink the
+  // field, and a cached size would then index past the end of the upb array.
+  for (size_t i = 0; i < upb_Array_Size(self->array); i++) {
     upb_MessageValue msgval = upb_Array_Get(self->array, i);
     VALUE val = Convert_UpbToRuby(msgval, self->type_info, self->arena);
     rb_yield(val);
@@ -289,8 +293,6 @@ static VALUE RepeatedField_index(int argc, VALUE* argv, VALUE _self) {
  */
 static VALUE RepeatedField_index_set(VALUE _self, VALUE _index, VALUE val) {
   RepeatedField* self = ruby_to_RepeatedField(_self);
-  int size = upb_Array_Size(self->array);
-  upb_Array* array = RepeatedField_GetMutable(_self);
   upb_Arena* arena = Arena_get(self->arena);
   upb_MessageValue msgval = Convert_RubyToUpb(val, "", self->type_info, arena);
 
@@ -299,8 +301,16 @@ static VALUE RepeatedField_index_set(VALUE _self, VALUE _index, VALUE val) {
     return Qnil;
   }
 
+  // The array and its size are read only after the conversions above, which
+  // can run Ruby code (index_position calls the index's to_int) that clears,
+  // shrinks or freezes the field.
+  upb_Array* array = RepeatedField_GetMutable(_self);
+  int size = upb_Array_Size(array);
+
   if (index >= size) {
-    upb_Array_Resize(array, index + 1, arena);
+    if (!upb_Array_Resize(array, index + 1, arena)) {
+      Arena_raise_oom();
+    }
     upb_MessageValue fill;
     memset(&fill, 0, sizeof(fill));
     for (int i = size; i < index; i++) {
@@ -331,7 +341,9 @@ static VALUE RepeatedField_push_vararg(int argc, VALUE* argv, VALUE _self) {
   for (i = 0; i < argc; i++) {
     upb_MessageValue msgval =
         Convert_RubyToUpb(argv[i], "", self->type_info, arena);
-    upb_Array_Append(array, msgval, arena);
+    if (!upb_Array_Append(array, msgval, arena)) {
+      Arena_raise_oom();
+    }
   }
 
   return _self;
@@ -351,7 +363,9 @@ static VALUE RepeatedField_push(VALUE _self, VALUE val) {
   upb_Array* array = RepeatedField_GetMutable(_self);
 
   upb_MessageValue msgval = Convert_RubyToUpb(val, "", self->type_info, arena);
-  upb_Array_Append(array, msgval, arena);
+  if (!upb_Array_Append(array, msgval, arena)) {
+    Arena_raise_oom();
+  }
 
   return _self;
 }
@@ -373,7 +387,9 @@ static VALUE RepeatedField_pop_one(VALUE _self) {
   last = upb_Array_Get(self->array, size - 1);
   ret = Convert_UpbToRuby(last, self->type_info, self->arena);
 
-  upb_Array_Resize(array, size - 1, Arena_get(self->arena));
+  if (!upb_Array_Resize(array, size - 1, Arena_get(self->arena))) {
+    Arena_raise_oom();
+  }
   return ret;
 }
 
@@ -391,7 +407,9 @@ static VALUE RepeatedField_replace(VALUE _self, VALUE list) {
   int i;
 
   Check_Type(list, T_ARRAY);
-  upb_Array_Resize(array, 0, Arena_get(self->arena));
+  if (!upb_Array_Resize(array, 0, Arena_get(self->arena))) {
+    Arena_raise_oom();
+  }
 
   for (i = 0; i < RARRAY_LEN(list); i++) {
     RepeatedField_push(_self, rb_ary_entry(list, i));
@@ -410,7 +428,9 @@ static VALUE RepeatedField_replace(VALUE _self, VALUE list) {
 static VALUE RepeatedField_clear(VALUE _self) {
   RepeatedField* self = ruby_to_RepeatedField(_self);
   upb_Array* array = RepeatedField_GetMutable(_self);
-  upb_Array_Resize(array, 0, Arena_get(self->arena));
+  if (!upb_Array_Resize(array, 0, Arena_get(self->arena))) {
+    Arena_raise_oom();
+  }
   return _self;
 }
 
@@ -447,7 +467,9 @@ static VALUE RepeatedField_dup(VALUE _self) {
 
   for (i = 0; i < size; i++) {
     upb_MessageValue msgval = upb_Array_Get(self->array, i);
-    upb_Array_Append(new_array, msgval, arena);
+    if (!upb_Array_Append(new_array, msgval, arena)) {
+      Arena_raise_oom();
+    }
   }
 
   return new_rptfield;
@@ -631,7 +653,9 @@ VALUE RepeatedField_plus(VALUE _self, VALUE list) {
 
     for (i = 0; i < size; i++) {
       upb_MessageValue msgval = upb_Array_Get(list_rptfield->array, i);
-      upb_Array_Append(dupped_array, msgval, arena);
+      if (!upb_Array_Append(dupped_array, msgval, arena)) {
+        Arena_raise_oom();
+      }
     }
   } else {
     rb_raise(rb_eArgError, "Unknown type appending to RepeatedField");
@@ -689,6 +713,7 @@ VALUE RepeatedField_init(int argc, VALUE* argv, VALUE _self) {
 
   self->type_info = TypeInfo_FromClass(argc, argv, 0, &self->type_class, &ary);
   self->array = upb_Array_New(arena, self->type_info.type);
+  if (!self->array) Arena_raise_oom();
   VALUE stored_val = ObjectCache_TryAdd(self->array, _self);
   PBRUBY_ASSERT(stored_val == _self);