diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-09 07:35:31 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-09 07:35:31 +0000 |
commit | 7d4115921291c8691ce46061a924f08a9607b07b (patch) | |
tree | d18c01902ef79e64476ab57ffa745a0be851ae77 /string.c | |
parent | 40a77284e5158e51e1099b09c50f79a3abe381b5 (diff) | |
download | ruby-7d4115921291c8691ce46061a924f08a9607b07b.tar.gz |
* string.c (rb_str_times): make empty strings to keep taintness,
and a little improvement. [ruby-dev:26900]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -412,13 +412,13 @@ rb_str_times(str, times) if (len < 0) { rb_raise(rb_eArgError, "negative argument"); } - if (LONG_MAX/len < RSTRING(str)->len) { + if (len && LONG_MAX/len < RSTRING(str)->len) { rb_raise(rb_eArgError, "argument too big"); } - str2 = rb_str_new5(str,0, RSTRING(str)->len*len); - for (i=0; i<len; i++) { - memcpy(RSTRING(str2)->ptr+(i*RSTRING(str)->len), + str2 = rb_str_new5(str,0, len *= RSTRING(str)->len); + for (i = 0; i < len; i += RSTRING(str)->len) { + memcpy(RSTRING(str2)->ptr + i, RSTRING(str)->ptr, RSTRING(str)->len); } RSTRING(str2)->ptr[RSTRING(str2)->len] = '\0'; |