commit 87a4ed19532be3b01da3134741ebf2c40ff3038e
author William Loh <wloh@google.com> Fri Jul 12 20:02:33 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 12 20:02:33 2024 +0000
tree 584efe99cbeb56fabe9f912e521f524ffc414528
parent 7c3df3c24ef9c022fdc51790a97968e4ca1cb138
parent 50896e77e4528a588b6fc1035dd0f95554f2ba15

Merge "Fail parseUri if end is missing" into sc-qpr1-dev

core/java/android/content/Intent.java

diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 6224758..ec67c72 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -7322,6 +7322,9 @@
                 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