Treat invalid characters as single byte for length

rubinius · Dec 28, 2012 · 9653426 · 9653426
1 parent f38f73c
commit 9653426
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/vm/builtin/string.cpp b/vm/builtin/string.cpp
@@ -1706,9 +1706,12 @@ namespace rubinius {
       for(i = 0; i < k && p < e; i++) {
         int c = Encoding::precise_mbclen(p, e, enc);
 
-        if(!ONIGENC_MBCLEN_CHARFOUND_P(c)) return nil<Fixnum>();
-
-        p += ONIGENC_MBCLEN_CHARFOUND_LEN(c);
+        // If it's an invalid byte, just treat it as a single byte
+        if(!ONIGENC_MBCLEN_CHARFOUND_P(c)) {
+          ++p;
+        } else {
+          p += ONIGENC_MBCLEN_CHARFOUND_LEN(c);
+        }
       }
 
       if(i < k) {