Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merge revision(s) 17483:

	* string.c (rb_str_buf_append): should infect.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_5@17484 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 4df809b0a7370c1f99213be84d6374bde8f38507 1 parent 5346f1b
@shyouhei shyouhei authored
Showing with 8 additions and 2 deletions.
  1. +4 −0 ChangeLog
  2. +3 −1 string.c
  3. +1 −1  version.h
View
4 ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 20 18:23:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (rb_str_buf_append): should infect.
+
Fri Jun 20 15:51:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_store, rb_ary_splice): not depend on unspecified
View
4 string.c
@@ -775,7 +775,9 @@ VALUE
rb_str_buf_append(str, str2)
VALUE str, str2;
{
- return str_buf_cat(str, RSTRING(str2)->ptr, RSTRING(str2)->len);
+ str_buf_cat(str, RSTRING(str2)->ptr, RSTRING(str2)->len);
+ OBJ_INFECT(str, str2);
+ return str;
}
VALUE
View
2  version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-20"
#define RUBY_VERSION_CODE 185
#define RUBY_RELEASE_CODE 20080620
-#define RUBY_PATCHLEVEL 230
+#define RUBY_PATCHLEVEL 231
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
Please sign in to comment.
Something went wrong with that request. Please try again.