diff options
| author | 2024-06-03 12:56:47 -0700 | |
|---|---|---|
| committer | 2024-06-13 23:05:48 +0000 | |
| commit | 6853510bc3070ee43de4b68ba26c3ca2164f8317 (patch) | |
| tree | f89b42ec0dc953df7f6e430c81d4e25da3b550f1 | |
| parent | ec5fe78cc6718eef3b0ba58c86e113ad0e118359 (diff) | |
Fail parseUri if end is missing
Bug: 318683126
Test: atest IntentTest
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b85bee508793e31d6fe37fc9cd4e8fa3787113cc)
Merged-In: I5f619ced684ff505ce2b7408cd35dd3e9be89dea
Change-Id: I5f619ced684ff505ce2b7408cd35dd3e9be89dea
| -rw-r--r-- | core/java/android/content/Intent.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 6224758ce71a..ec67c7239df2 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -7322,6 +7322,9 @@ public class Intent implements Parcelable, Cloneable { int eq = uri.indexOf('=', i); if (eq < 0) eq = i-1; int semi = uri.indexOf(';', i); + if (semi < 0) { + throw new URISyntaxException(uri, "uri end not found"); + } String value = eq < semi ? Uri.decode(uri.substring(eq + 1, semi)) : ""; // action |