diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-04-04 15:25:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-04 15:25:33 -0700 |
| commit | e511fb33d33f0ba83ce437f615fa236f369b5ade (patch) | |
| tree | 1db7d5eaf09553cd6cf416358b7ae69b82324cef /core/java/android/text/util | |
| parent | 8f7aad147d790b25bae7301827e070df72690341 (diff) | |
| parent | 9b1b64399502af0a08beac3014f2294644753602 (diff) | |
| download | frameworks_base-e511fb33d33f0ba83ce437f615fa236f369b5ade.zip frameworks_base-e511fb33d33f0ba83ce437f615fa236f369b5ade.tar.gz frameworks_base-e511fb33d33f0ba83ce437f615fa236f369b5ade.tar.bz2 | |
am 9b1b6439: am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
* commit '9b1b64399502af0a08beac3014f2294644753602':
Always return a valid index from Rfc822Tokenizer.findTokenEnd()
Diffstat (limited to 'core/java/android/text/util')
| -rw-r--r-- | core/java/android/text/util/Rfc822Tokenizer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/text/util/Rfc822Tokenizer.java b/core/java/android/text/util/Rfc822Tokenizer.java index 69cf93c..68334e4 100644 --- a/core/java/android/text/util/Rfc822Tokenizer.java +++ b/core/java/android/text/util/Rfc822Tokenizer.java @@ -256,7 +256,7 @@ public class Rfc822Tokenizer implements MultiAutoCompleteTextView.Tokenizer { if (c == '"') { i++; break; - } else if (c == '\\') { + } else if (c == '\\' && i + 1 < len) { i += 2; } else { i++; @@ -275,7 +275,7 @@ public class Rfc822Tokenizer implements MultiAutoCompleteTextView.Tokenizer { } else if (c == '(') { level++; i++; - } else if (c == '\\') { + } else if (c == '\\' && i + 1 < len) { i += 2; } else { i++; |