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

Worked around memory leak bug in Ruby interpreter.

Browse Source 
Change-Id: I8e2b425f9008e6b82d41d59783bb8b04af1f886f
Fixes: https://github.com/google/protobuf/issues/474.
This commit is contained in:
Josh Haberman 2015-07-08 14:14:58 -07:00
parent ab2094de11
commit 8c717ad530
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ruby/ext/google/protobuf_c/encode_decode.c
View File

@ -30,6 +30,18 @@
#include "protobuf.h"
// This function is equivalent to rb_str_cat(), but unlike the real
// rb_str_cat(), it doesn't leak memory in some versions of Ruby.
// For more information, see:
// https://bugs.ruby-lang.org/issues/11328
VALUE noleak_rb_str_cat(VALUE rb_str, const char *str, long len) {
size_t oldlen = RSTRING_LEN(rb_str);
rb_str_modify_expand(rb_str, len);
char *p = RSTRING_PTR(rb_str);
memcpy(p + oldlen, str, len);
rb_str_set_len(rb_str, oldlen + len);
}
// -----------------------------------------------------------------------------
// Parsing.
// -----------------------------------------------------------------------------
@ -164,7 +176,7 @@ static size_t stringdata_handler(void* closure, const void* hd,
const char* str, size_t len,
const upb_bufhandle* handle) {
VALUE rb_str = (VALUE)closure;
rb_str_cat(rb_str, str, len);
noleak_rb_str_cat(rb_str, str, len);
return len;
}