mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2025-01-05 12:50:48 -05:00
83deffda2e
18.1: gains working backport for system/bt 19.1: no effective change Signed-off-by: Tavi <tavi@divested.dev>
31 lines
1.4 KiB
Diff
31 lines
1.4 KiB
Diff
From aa9853f993a575fb59dd2ccc4cfeb54bbaa1ab4d Mon Sep 17 00:00:00 2001
|
|
From: William Loh <wloh@google.com>
|
|
Date: Mon, 3 Jun 2024 12:56:47 -0700
|
|
Subject: [PATCH] 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)
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a649e8e9abfb16548ccf57d8b740b4bf9ff73ef4)
|
|
Merged-In: I5f619ced684ff505ce2b7408cd35dd3e9be89dea
|
|
Change-Id: I5f619ced684ff505ce2b7408cd35dd3e9be89dea
|
|
---
|
|
core/java/android/content/Intent.java | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
|
|
index 6224758ce71a4..ec67c7239df25 100644
|
|
--- a/core/java/android/content/Intent.java
|
|
+++ b/core/java/android/content/Intent.java
|
|
@@ -7322,6 +7322,9 @@ private static Intent parseUriInternal(String uri, @UriFlags int flags)
|
|
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
|