Merge "Fail parseUri if end is missing" into tm-qpr-dev

1 files changed, 3 insertions, 0 deletions

diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 809dc3c41188..729c8798eeac 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -7656,6 +7656,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