diff options
| author | Keith Ito <kito@google.com> | 2010-05-11 10:26:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-11 10:26:24 -0700 |
| commit | a52c85dab1f48916f347d0e7bdaaa0bf1df5c4a8 (patch) | |
| tree | 2e7adf7b6ec3ac0e3e539a12116920a0e0bd2f51 /core/java/android/net | |
| parent | bfd6805a8228d9b2f5e3476155456a6471b290cd (diff) | |
| parent | 8528fcb1998d8be708a16a854293db95a87732d5 (diff) | |
| download | frameworks_base-a52c85dab1f48916f347d0e7bdaaa0bf1df5c4a8.zip frameworks_base-a52c85dab1f48916f347d0e7bdaaa0bf1df5c4a8.tar.gz frameworks_base-a52c85dab1f48916f347d0e7bdaaa0bf1df5c4a8.tar.bz2 | |
am 8528fcb1: am a8d8cb12: am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
Diffstat (limited to 'core/java/android/net')
| -rw-r--r-- | core/java/android/net/Uri.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java index eca4569..47faaba 100644 --- a/core/java/android/net/Uri.java +++ b/core/java/android/net/Uri.java @@ -1588,6 +1588,9 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { break; } final int equalsIndex = keyIndex + encodedKeyLength; + if (equalsIndex >= query.length()) { + break; + } if (query.charAt(equalsIndex) != '=') { encodedKeySearchIndex = equalsIndex + 1; continue; |