Merge pull request #8970 from haberman/ruby-repeated-plus-arena

Fixed a memory bug with RepeatedField#+.
protocolbuffers · Sep 13, 2021 · ac02d6c · ac02d6c
2 parents 39dc8ad + 79ac88b
commit ac02d6c
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/ruby/ext/google/protobuf_c/repeated_field.c b/ruby/ext/google/protobuf_c/repeated_field.c
@@ -551,6 +551,7 @@ VALUE RepeatedField_plus(VALUE _self, VALUE list) {
     RepeatedField* dupped = ruby_to_RepeatedField(dupped_);
     upb_array *dupped_array = RepeatedField_GetMutable(dupped_);
     upb_arena* arena = Arena_get(dupped->arena);
+    Arena_fuse(list_rptfield->arena, arena);
     int size = upb_array_size(list_rptfield->array);
     int i;