From c96dfedf7dfb2e1c55c4f69587ea6ef4e20c5c90 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 9 Sep 2005 07:35:31 +0000 Subject: * string.c (rb_str_times): make empty strings to keep taintness, and a little improvement. [ruby-dev:26900] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ string.c | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 431d90941..19b8e7604 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 9 16:35:04 2005 Nobuyoshi Nakada + + * string.c (rb_str_times): make empty strings to keep taintness, + and a little improvement. [ruby-dev:26900] + Thu Sep 8 14:58:11 2005 Yukihiro Matsumoto * merged a patch from Takahiro Kambe to diff --git a/string.c b/string.c index 2ad842af8..206ef7069 100644 --- a/string.c +++ b/string.c @@ -416,17 +416,16 @@ rb_str_times(str, times) long i, len; len = NUM2LONG(times); - if (len == 0) return rb_str_new5(str,0,0); 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; iptr+(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'; -- cgit