* array.c (rb_values_at): extract common procedure from

  rb_ary_values_at.  follow DRY principle.

* re.c (match_values_at): values_at should understand ranges.

* struct.c (rb_struct_values_at): ditto.

* struct.c (inspect_struct): inspect format changed; add "struct "
  at the top.

* sprintf.c (rb_f_sprintf): "%p" specifier for inspect output.
  (RCR#68)

* eval.c (rb_mod_undef_method): allow "undef_method" to accept
  multiple arguments. (RCR#146)

* lib/timeout.rb: put timeout in Timeout module. (RCR#121)
  [ruby-talk:61028]

* re.c (match_groups): new method added. (RCR#139)

* variable.c (rb_mod_const_of): should exclude constant defined
  in Object, unless retrieving constants of Object.

* string.c (rb_str_new4): do not allocate new string if original
  is frozen or already have copy-on-write entry. [ruby-talk:74940]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4031 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 3 deletions

diff --git a/string.c b/string.c
index 25b325f0ec..692a158c09 100644
--- a/string.c
+++ b/string.c
@@ -157,14 +157,17 @@ rb_str_new4(orig)
 {
     VALUE klass, str;
 
+    if (OBJ_FROZEN(orig)) return orig;
     klass = rb_obj_class(orig);
     if (FL_TEST(orig, ELTS_SHARED) && RSTRING(orig)->aux.shared) {
 	long ofs;
 	str = RSTRING(orig)->aux.shared;
 	ofs = RSTRING(str)->len - RSTRING(orig)->len;
-	str = str_new3(klass, str);
-	RSTRING(str)->ptr += ofs;
-	RSTRING(str)->len -= ofs;
+	if (ofs > 0) {
+	    str = str_new3(klass, str);
+	    RSTRING(str)->ptr += ofs;
+	    RSTRING(str)->len -= ofs;
+	}
     }
     else if (FL_TEST(orig, STR_ASSOC)) {
 	str = str_new(klass, RSTRING(orig)->ptr, RSTRING(orig)->len);