浏览代码

A very small fix to silence some warnings.

Also updated the Gemfile.lock since alpha-4 has been
pushed to RubyGems.

Change-Id: I8ddc5f125f28aa9a33c88dfe48251a75a877e1d3
Josh Haberman 10 年之前
父节点
当前提交
14e2b4fa51
共有 2 个文件被更改,包括 7 次插入2 次删除
  1. 4 1
      ruby/Gemfile.lock
  2. 3 1
      ruby/ext/google/protobuf_c/encode_decode.c

+ 4 - 1
ruby/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
 PATH
   remote: .
   remote: .
   specs:
   specs:
-    google-protobuf (3.0.0.alpha.4)
+    google-protobuf (3.0.0.alpha.4.0)
 
 
 GEM
 GEM
   remote: https://rubygems.org/
   remote: https://rubygems.org/
@@ -23,3 +23,6 @@ DEPENDENCIES
   rake-compiler
   rake-compiler
   rubygems-tasks
   rubygems-tasks
   test-unit
   test-unit
+
+BUNDLED WITH
+   1.10.6

+ 3 - 1
ruby/ext/google/protobuf_c/encode_decode.c

@@ -35,11 +35,13 @@
 // For more information, see:
 // For more information, see:
 //   https://bugs.ruby-lang.org/issues/11328
 //   https://bugs.ruby-lang.org/issues/11328
 VALUE noleak_rb_str_cat(VALUE rb_str, const char *str, long len) {
 VALUE noleak_rb_str_cat(VALUE rb_str, const char *str, long len) {
+  char *p;
   size_t oldlen = RSTRING_LEN(rb_str);
   size_t oldlen = RSTRING_LEN(rb_str);
   rb_str_modify_expand(rb_str, len);
   rb_str_modify_expand(rb_str, len);
-  char *p = RSTRING_PTR(rb_str);
+  p = RSTRING_PTR(rb_str);
   memcpy(p + oldlen, str, len);
   memcpy(p + oldlen, str, len);
   rb_str_set_len(rb_str, oldlen + len);
   rb_str_set_len(rb_str, oldlen + len);
+  return rb_str;
 }
 }
 
 
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------