From 5112cfef2a2023a2629a426154547444593e9f9b Mon Sep 17 00:00:00 2001
From: Alex Buynytskyy <alexbuy@google.com>
Date: Wed, 1 Mar 2023 09:56:23 -0800
Subject: [PATCH] Stop processing on IOException.

IOException usually means that the file is corrupted and further
processing is dangerous and should be stopped.

Bug: 269049175
Bug: 246540168
Fixes: 269049175
Test: atest ShortcutManagerTest1
Change-Id: I493c2658298dc23d45b37776663f316d31238b52
---
 .../com/android/server/pm/ShortcutPackage.java    |   3 +++
 services/tests/servicestests/Android.bp           |   1 +
 services/tests/servicestests/AndroidTest.xml      |   2 ++
 .../tests/servicestests/data/broken_shortcut.xml  | Bin 0 -> 851 bytes
 .../android/server/pm/ShortcutManagerTest1.java   |  12 ++++++++++++
 5 files changed, 18 insertions(+)
 create mode 100644 services/tests/servicestests/data/broken_shortcut.xml

diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java
index 67639fbef1245..28cb7f0b03a66 100644
--- a/services/core/java/com/android/server/pm/ShortcutPackage.java
+++ b/services/core/java/com/android/server/pm/ShortcutPackage.java
@@ -2048,6 +2048,9 @@ class ShortcutPackage extends ShortcutPackageItem {
                                         shortcutUser.getUserId(), fromBackup);
                                 // Don't use addShortcut(), we don't need to save the icon.
                                 ret.mShortcuts.put(si.getId(), si);
+                            } catch (IOException e) {
+                                // Don't ignore IO exceptions.
+                                throw e;
                             } catch (Exception e) {
                                 // b/246540168 malformed shortcuts should be ignored
                                 Slog.e(TAG, "Failed parsing shortcut.", e);
diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp
index 3a7b9a49f1610..90dbd539f0293 100644
--- a/services/tests/servicestests/Android.bp
+++ b/services/tests/servicestests/Android.bp
@@ -115,6 +115,7 @@ android_test {
         ":StubTestApp",
         ":SuspendTestApp",
         ":MediaButtonReceiverHolderTestHelperApp",
+        "data/broken_shortcut.xml",
     ],
 
     java_resources: [
diff --git a/services/tests/servicestests/AndroidTest.xml b/services/tests/servicestests/AndroidTest.xml
index d9676470aca37..b304968f3e69d 100644
--- a/services/tests/servicestests/AndroidTest.xml
+++ b/services/tests/servicestests/AndroidTest.xml
@@ -21,6 +21,8 @@
         <option name="cleanup" value="true" />
         <option name="push-file" key="SimpleServiceTestApp3.apk"
                 value="/data/local/tmp/cts/content/SimpleServiceTestApp3.apk" />
+        <option name="push-file" key="broken_shortcut.xml"
+                value="/data/local/tmp/cts/content/broken_shortcut.xml" />
     </target_preparer>
 
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
diff --git a/services/tests/servicestests/data/broken_shortcut.xml b/services/tests/servicestests/data/broken_shortcut.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f2b083ddc3a0f304cfd3390fb5d6455eca76d97c
GIT binary patch
literal 851
zcmZ`&&uiN-7*)FFN3*QW27|HFpl7?5?Iax`hZZ^*Y}pQj?Pg?2NknYPNOIlwzu8~f
z=~L{|Lw7Kk_vw4@`91mS`VX4MkB?|r5xOT^e&ODaB`G<2M^zaT$+QwIq&uxjKO9q1
z6aiJWw5S)s@o_<n4Kz2rLrx9d@sb3$TpOVz>LnmCX(a+7HwqSq-TY*h;uOb8k^npf
zzN}^yu{^WFS$Tu!i+LL3c$P+y*BqD~VXA2zOq?av1iAZ!x<Wk+EFYd@PEuGw3h}^M
zJ3r0$nb9=sJRAjn?R^U$xB^cCJ5hrA@DU@kQ`*wng2s_xXexOVSds_N2O~nQxE1yu
z&0k0npsiBdf<NU;s>-w>hu?{iz}~mQ790)Ny!qq=02+G8sg7fu#1X!{One+C9{06<
zj51e+sx{>q0GY}+wV^Ic1`Gqs@2n$et79cM#?}6WoH1cYUU23LB?h|d1l&nW%F36q
zn9nedl4O<w=dmVo-yZC53bHlmRT}%fk)TS#-SCca{CP2p=CCvA2Hx~J)1(2}i~qZa
z^any(E`9c|53jCt!_nXKuYRzE+?8DU>niFp>`Dm_gYd`Cn{~Fn`JMf`x?UEfmUQ<8
q46mX)?5-Ad&(hUXDd}WZFLbB$_RtfsAO4Ck*QzmGhu=tz(A$3i_A*ic

literal 0
HcmV?d00001

diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java
index 0a718e3294987..95a42ff91a95c 100644
--- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java
@@ -4007,6 +4007,18 @@ public class ShortcutManagerTest1 extends BaseShortcutManagerTest {
         // TODO Check all other fields
     }
 
+    public void testLoadCorruptedShortcuts() throws Exception {
+        initService();
+
+        addPackage("com.android.chrome", 0, 0);
+
+        ShortcutUser user = new ShortcutUser(mService, 0);
+
+        File corruptedShortcutPackage = new File("/data/local/tmp/cts/content/",
+                "broken_shortcut.xml");
+        assertNull(ShortcutPackage.loadFromFile(mService, user, corruptedShortcutPackage, false));
+    }
+
     public void testSaveCorruptAndLoadUser() throws Exception {
         // First, create some shortcuts and save.
         runWithCaller(CALLING_PACKAGE_1, UserHandle.USER_SYSTEM, () -> {