summaryrefslogtreecommitdiff
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
commit13661316426b677dd08438a983463b0218b154af (patch)
tree6ca7c2a80e2b8234f223b4e3ed90324dc37de910
parent0c80ce785d85482d574b5a212218034a6ec12397 (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/trunk@11201 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--string.c11
2 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ab47f72c3..27d4bd3fdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Oct 22 16:47:56 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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]
+
Sat Oct 21 17:50:40 2006 Akinori MUSHA <knu@iDaemons.org>
* ext/digest/lib/digest.rb: Follow the framework updates.
diff --git a/string.c b/string.c
index 2aa24a59c4..39bae6d63d 100644
--- a/string.c
+++ b/string.c
@@ -203,7 +203,6 @@ str_new3(VALUE klass, VALUE str)
RSTRING(str2)->as.heap.aux.shared = str;
FL_SET(str2, ELTS_SHARED);
}
- OBJ_INFECT(str2, str);
return str2;
}
@@ -211,7 +210,10 @@ str_new3(VALUE klass, VALUE str)
VALUE
rb_str_new3(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
@@ -246,7 +248,7 @@ rb_str_new4(VALUE orig)
&& klass == RBASIC(str)->klass) {
long ofs;
ofs = RSTRING_LEN(str) - RSTRING_LEN(orig);
- if (ofs > 0) {
+ if ((ofs > 0) || (!OBJ_TAINTED(str) && OBJ_TAINTED(orig))) {
str = str_new3(klass, str);
RSTRING(str)->as.heap.ptr += ofs;
RSTRING(str)->as.heap.len -= ofs;
@@ -635,7 +637,8 @@ rb_str_substr(VALUE str, long beg, long len)
}
else if (len > RSTRING_EMBED_LEN_MAX &&
beg + len == RSTRING_LEN(str) && !STR_ASSOC_P(str)) {
- str2 = rb_str_new3(rb_str_new4(str));
+ str2 = rb_str_new4(str);
+ str2 = str_new3(rb_obj_class(str2), str2);
RSTRING(str2)->as.heap.ptr += RSTRING_LEN(str2) - len;
RSTRING(str2)->as.heap.len = len;
}