summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-22 07:48:53 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-22 07:48:53 +0000
commitba431dde6fad427a403aa344db6ebfe4e947d746 (patch)
tree04528b339d29f1686d1f67374afcbc8f9d1ba6a8 /string.c
parentf6110f672691f5cefc9e8b3f13ad2dbba7c20ab9 (diff)
* string.c (rb_str_substr): should be infected with only original
string, but not the shared string. fixed: [ruby-core:09152] * strnig.c (rb_str_new4): keep shared string untainted when orignal string is tainted. fixed: [ruby-dev:29672] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11201 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/string.c b/string.c
index 828bc07..9ab850a 100644
--- a/string.c
+++ b/string.c
@@ -146,7 +146,6 @@ str_new3(klass, str)
RSTRING(str2)->ptr = RSTRING(str)->ptr;
RSTRING(str2)->aux.shared = str;
FL_SET(str2, ELTS_SHARED);
- OBJ_INFECT(str2, str);
return str2;
}
@@ -155,7 +154,10 @@ VALUE
rb_str_new3(str)
VALUE str;
{
- return str_new3(rb_obj_class(str), str);
+ VALUE str2 = str_new3(rb_obj_class(str), str);
+
+ OBJ_INFECT(str2, str);
+ return str2;
}
static VALUE
@@ -189,7 +191,7 @@ rb_str_new4(orig)
if (FL_TEST(orig, ELTS_SHARED) && (str = RSTRING(orig)->aux.shared) && klass == RBASIC(str)->klass) {
long ofs;
ofs = RSTRING(str)->len - RSTRING(orig)->len;
- if (ofs > 0) {
+ if ((ofs > 0) || (!OBJ_TAINTED(str) && OBJ_TAINTED(orig))) {
str = str_new3(klass, str);
RSTRING(str)->ptr += ofs;
RSTRING(str)->len -= ofs;
@@ -610,7 +612,8 @@ rb_str_substr(str, beg, len)
}
else if (len > sizeof(struct RString)/2 &&
beg + len == RSTRING(str)->len && !FL_TEST(str, STR_ASSOC)) {
- str2 = rb_str_new3(rb_str_new4(str));
+ str2 = rb_str_new4(str);
+ str2 = str_new3(rb_obj_class(str2), str2);
RSTRING(str2)->ptr += RSTRING(str2)->len - len;
RSTRING(str2)->len = len;
}