[macruby-changes] [3713] MacRuby/branches/icu/string.c

[source_changes at macosforge.org]

Revision: 3713
          http://trac.macosforge.org/projects/ruby/changeset/3713
Author:   lsansonetti at apple.com
Date:     2010-03-08 14:33:58 -0800 (Mon, 08 Mar 2010)
Log Message:
-----------
misc bug fixes

Modified Paths:
--------------
    MacRuby/branches/icu/string.c

Modified: MacRuby/branches/icu/string.c
===================================================================
--- MacRuby/branches/icu/string.c	2010-03-07 02:44:47 UTC (rev 3712)
+++ MacRuby/branches/icu/string.c	2010-03-08 22:33:58 UTC (rev 3713)
@@ -1956,9 +1956,6 @@
 	if (pos >= len) {
 	    pos = len - 1;
 	}
-	else if (pos == 0) {
-	    return Qnil;
-	}
     }
     else {
 	pos = len - 1;
@@ -2003,7 +2000,7 @@
 {
     rb_str_t *newstr = str_dup(RSTR(self));
     str_concat_string(newstr, str_need_string(other));
-    if (OBJ_TAINTED(self)) {
+    if (OBJ_TAINTED(self) || OBJ_TAINTED(other)) {
 	OBJ_TAINT(newstr);
     }
     return (VALUE)newstr;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100308/087fc778/attachment.html>