From 765255b737235a65daea6679c4672541bb67ecb4 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 2 Feb 2001 11:38:20 +0000
Subject: * array.c (rb_ary_sort_bang): returns self, even if its length is  
 less than 2.

* eval.c (POP_VARS): propagate DVAR_DONT_RECYCLE, if
  SCOPE_DONT_RECYCLE of ruby_scope is set.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 string.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'string.c')

diff --git a/string.c b/string.c
index cb7e86e84c..adc1c8d3c2 100644
--- a/string.c
+++ b/string.c
@@ -1288,17 +1288,20 @@ str_gsub(argc, argv, str, bang)
 	if (str_independent(str)) {
 	    free(RSTRING(str)->ptr);
 	}
+	else {
+	    RSTRING(str)->orig = 0;
+	}
     }
     else {
 	NEWOBJ(dup, struct RString);
 	OBJSETUP(dup, rb_cString, T_STRING);
 	OBJ_INFECT(dup, str);
 	str = (VALUE)dup;
+	dup->orig = 0;
     }
     RSTRING(str)->ptr = buf;
     RSTRING(str)->len = len = bp - buf;
     RSTRING(str)->ptr[len] = '\0';
-    RSTRING(str)->orig = 0;
 
     if (tainted) OBJ_TAINT(str);
     return str;
-- 
cgit v1.2.3