diff options
| author | Keith Ito <kito@google.com> | 2010-05-10 20:41:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-10 20:41:47 -0700 |
| commit | be65399baf23855094596e27c25763ff92e9e027 (patch) | |
| tree | 33ebd80e7c629afea59a2e80ac4de3c445807775 /core/java/android/net/Uri.java | |
| parent | f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776 (diff) | |
| parent | 9114a8bb8b241bb8d3be307b29e64ea64ab27901 (diff) | |
| download | frameworks_base-be65399baf23855094596e27c25763ff92e9e027.zip frameworks_base-be65399baf23855094596e27c25763ff92e9e027.tar.gz frameworks_base-be65399baf23855094596e27c25763ff92e9e027.tar.bz2 | |
Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
Diffstat (limited to 'core/java/android/net/Uri.java')
| -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; |