diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-17 14:40:06 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-17 14:40:06 +0000 |
commit | ffe229399843b3ddb86511c0627e208e989efc49 (patch) | |
tree | 327c78ac040ee95f31b66da7466c89168160f5af /string.c | |
parent | f2107f2ec1cfcc9e86bb69949faf21e161516076 (diff) | |
download | ruby-ffe229399843b3ddb86511c0627e208e989efc49.tar.gz |
* test/socket/test_tcp.rb (TestTCPSocket::test_recvfrom): typo
fixed. [ruby-dev:27123]
* string.c (rb_str_substr): should propagate taintness even for
empty strings. [ruby-dev:27121]
* string.c (rb_str_aref): should infect result if range argument
is tainted. [ruby-dev:27121]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -541,9 +541,10 @@ rb_str_substr(VALUE str, long beg, long len) if (len < 0) { len = 0; } - if (len == 0) return rb_str_new5(str,0,0); - - if (len > sizeof(struct RString)/2 && + if (len == 0) { + str2 = rb_str_new5(str,0,0); + } + 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)); RSTRING(str2)->ptr += RSTRING(str2)->len - len; @@ -1433,13 +1434,17 @@ rb_str_aref(VALUE str, VALUE indx) /* check if indx is Range */ { long beg, len; + VALUE tmp; + switch (rb_range_beg_len(indx, &beg, &len, RSTRING(str)->len, 0)) { case Qfalse: break; case Qnil: return Qnil; default: - return rb_str_substr(str, beg, len); + tmp = rb_str_substr(str, beg, len); + OBJ_INFECT(tmp, indx); + return tmp; } } idx = NUM2LONG(indx); |