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

Fixed a memory bug with RepeatedField#+.
3 years ago · ac02d6cbaa
parent 39dc8ad11f 79ac88bbbb
commit ac02d6cbaa
1 changed files with 1 additions and 0 deletions
--- 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;