From 3a18299cc0643e7bf73653e8ff9a1d615f295407 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Mon, 25 Oct 2021 15:41:19 -0400 Subject: [PATCH] Fix memory leak in MessageClass.encode If the line above raises an exception, the upb_arena is lost and memory is leaked. --- ruby/ext/google/protobuf_c/message.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ruby/ext/google/protobuf_c/message.c b/ruby/ext/google/protobuf_c/message.c index 59602cf0899d..d07eba760d23 100644 --- a/ruby/ext/google/protobuf_c/message.c +++ b/ruby/ext/google/protobuf_c/message.c @@ -1012,7 +1012,6 @@ static VALUE Message_decode_json(int argc, VALUE* argv, VALUE klass) { */ static VALUE Message_encode(VALUE klass, VALUE msg_rb) { Message* msg = ruby_to_Message(msg_rb); - upb_arena *arena = upb_arena_new(); const char *data; size_t size; @@ -1020,6 +1019,8 @@ static VALUE Message_encode(VALUE klass, VALUE msg_rb) { rb_raise(rb_eArgError, "Message of wrong type."); } + upb_arena *arena = upb_arena_new(); + data = upb_encode(msg->msg, upb_msgdef_layout(msg->msgdef), arena, &size);