OSDN Git Service

Keep Rfc822Tokenizer from crashing when the string ends with a backslash.
authorEric Fischer <enf@google.com>
Tue, 16 Feb 2010 18:37:45 +0000 (10:37 -0800)
committerEric Fischer <enf@google.com>
Tue, 16 Feb 2010 22:34:32 +0000 (14:34 -0800)
Bug 2442537

core/java/android/text/util/Rfc822Tokenizer.java

index 9d8bfd9..69d745d 100644 (file)
@@ -84,7 +84,7 @@ public class Rfc822Tokenizer implements MultiAutoCompleteTextView.Tokenizer {
                     if (c == '"') {
                         i++;
                         break;
-                    } else if (c == '\\') {
+                    } else if (c == '\\' && i + 1 < cursor) {
                         name.append(text.charAt(i + 1));
                         i += 2;
                     } else {
@@ -110,7 +110,7 @@ public class Rfc822Tokenizer implements MultiAutoCompleteTextView.Tokenizer {
                         comment.append(c);
                         level++;
                         i++;
-                    } else if (c == '\\') {
+                    } else if (c == '\\' && i + 1 < cursor) {
                         comment.append(text.charAt(i + 1));
                         i += 2;
                     } else {