Modified: MacRuby/branches/icu/string.c (3738 => 3739)

--- MacRuby/branches/icu/string.c	2010-03-11 22:07:20 UTC (rev 3738)
+++ MacRuby/branches/icu/string.c	2010-03-11 22:27:51 UTC (rev 3739)
@@ -3032,7 +3032,7 @@
     }
     StringValue(rs);
 
-    const long len = str_length(RSTR(str), false);
+    const long len = rb_str_chars_len(str);
     if (len == 0) {
 	return Qnil;
     }
@@ -3046,7 +3046,7 @@
 	UChar c = str_get_uchar(RSTR(str), len - 1, false);
 	if (c == '\n') {
 	    to_del++;
-	    c = str_get_uchar(RSTR(str), len - 2, false);
+	    c = len > 1 ? str_get_uchar(RSTR(str), len - 2, false) : 0;
 	}
 	if (c == '\r' && (rslen > 0 || to_del != 0)) {
 	    to_del++;