[前][次][番号順一覧][スレッド一覧]

ruby-changes:18295

From: yugui <ko1@a...>
Date: Thu, 23 Dec 2010 21:45:53 +0900 (JST)
Subject: [ruby-changes:18295] Ruby:r30317 (ruby_1_9_2): merges r30122 from trunk into ruby_1_9_2.

yugui	2010-12-23 21:45:26 +0900 (Thu, 23 Dec 2010)

  New Revision: 30317

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30317

  Log:
    merges r30122 from trunk into ruby_1_9_2.
    --
    * io.c (io_read): duplicate string if shared. [ruby-dev:42719]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/io.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30316)
+++ ruby_1_9_2/ChangeLog	(revision 30317)
@@ -1,3 +1,7 @@
+Tue Dec  7 22:37:15 2010  Masaya Tarui  <tarui@r...>
+
+	* io.c (io_read): duplicate string if shared. [ruby-dev:42719]
+
 Tue Dec  7 21:59:37 2010  Kouhei Sutou  <kou@c...>
 
 	* lib/rexml/light/node.rb: remove circular require.
Index: ruby_1_9_2/io.c
===================================================================
--- ruby_1_9_2/io.c	(revision 30316)
+++ ruby_1_9_2/io.c	(revision 30317)
@@ -2157,7 +2157,10 @@
     rb_scan_args(argc, argv, "02", &length, &str);
 
     if (NIL_P(length)) {
-	if (!NIL_P(str)) StringValue(str);
+	if (!NIL_P(str)){
+	    StringValue(str);
+	    rb_str_modify(str);
+	}
 	GetOpenFile(io, fptr);
 	rb_io_check_char_readable(fptr);
 	return read_all(fptr, remain_size(fptr), str);
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30316)
+++ ruby_1_9_2/version.h	(revision 30317)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 122
+#define RUBY_PATCHLEVEL 123
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]