AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fix memory leak in MessageClass.encode

Browse Source 
If the line above raises an exception, the upb_arena is lost and memory
is leaked.
This commit is contained in:
Peter Zhu 2021-10-25 15:41:19 -04:00 committed by Adam Cozzette
parent e58469bdbe
commit b2ac7ced50
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruby/ext/google/protobuf_c/message.c
View File

@ -1012,7 +1012,6 @@ static VALUE Message_decode_json(int argc, VALUE* argv, VALUE klass) {
*/ */
static VALUE Message_encode(VALUE klass, VALUE msg_rb) { static VALUE Message_encode(VALUE klass, VALUE msg_rb) {
Message* msg = ruby_to_Message(msg_rb); Message* msg = ruby_to_Message(msg_rb);
upb_arena *arena = upb_arena_new();
const char *data; const char *data;
size_t size; size_t size;
@ -1020,6 +1019,8 @@ static VALUE Message_encode(VALUE klass, VALUE msg_rb) {
rb_raise(rb_eArgError, "Message of wrong type."); 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, data = upb_encode(msg->msg, upb_msgdef_layout(msg->msgdef), arena,
&size); &size);