From a877c034421143932c25daaca5f92a48ef6c3b81 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Tue, 16 Feb 2010 10:37:45 -0800
Subject: Keep Rfc822Tokenizer from crashing when the string ends with a
 backslash.

Bug 2442537
---
 core/java/android/text/util/Rfc822Tokenizer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/java/android/text/util')

diff --git a/core/java/android/text/util/Rfc822Tokenizer.java b/core/java/android/text/util/Rfc822Tokenizer.java
index 9d8bfd9..69d745d 100644
--- a/core/java/android/text/util/Rfc822Tokenizer.java
+++ b/core/java/android/text/util/Rfc822Tokenizer.java
@@ -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 {
-- 
cgit v1.1