aboutsummaryrefslogtreecommitdiffhomepage
path: root/ruby
diff options
context:
space:
mode:
authorGravatar Josh Haberman <jhaberman@gmail.com>2015-07-08 14:14:58 -0700
committerGravatar Josh Haberman <jhaberman@gmail.com>2015-07-08 14:14:58 -0700
commit8c717ad5300c69046a84d34e1ba603b5f75d1cb3 (patch)
treeba13e68f1e8f64e3c7c9c7bb2eee4fc86bf4812f /ruby
parentab2094de11155ffa57e7d38a9b996dd038af981e (diff)
Worked around memory leak bug in Ruby interpreter.
Change-Id: I8e2b425f9008e6b82d41d59783bb8b04af1f886f Fixes: https://github.com/google/protobuf/issues/474.
Diffstat (limited to 'ruby')
-rw-r--r--ruby/ext/google/protobuf_c/encode_decode.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/ruby/ext/google/protobuf_c/encode_decode.c b/ruby/ext/google/protobuf_c/encode_decode.c
index fe249d45..f789f6d4 100644
--- a/ruby/ext/google/protobuf_c/encode_decode.c
+++ b/ruby/ext/google/protobuf_c/encode_decode.c
@@ -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;
}