diff options
| author | Jon Noack <noackjr@google.com> | 2019-09-10 11:29:26 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-10 11:29:26 -0700 |
| commit | ec3dd06219453c3919890c4e68061eb40a38a881 (patch) | |
| tree | 39a3f8a28908e4472402613f4ccb3205ef128087 | |
| parent | 1ee1330da83b5018390a8ac81ef977153e6b78a0 (diff) | |
| parent | f772220347f701a26a319b15791dc1709717375d (diff) | |
| download | multidex-ec3dd06219453c3919890c4e68061eb40a38a881.tar.gz | |
Merge "Force re-extraction if dex number is invalid" am: 6944597270 am: 92d835c69a
am: f772220347
Change-Id: I65727a6c04fd182cb7aad673fa789d8ef185a83b
| -rw-r--r-- | library/src/androidx/multidex/MultiDexExtractor.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/library/src/androidx/multidex/MultiDexExtractor.java b/library/src/androidx/multidex/MultiDexExtractor.java index 2b96113..a63d724 100644 --- a/library/src/androidx/multidex/MultiDexExtractor.java +++ b/library/src/androidx/multidex/MultiDexExtractor.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.os.Build; import android.util.Log; + import java.io.BufferedOutputStream; import java.io.Closeable; import java.io.File; @@ -177,7 +178,11 @@ final class MultiDexExtractor implements Closeable { final String extractedFilePrefix = sourceApk.getName() + EXTRACTED_NAME_EXT; SharedPreferences multiDexPreferences = getMultiDexPreferences(context); - int totalDexNumber = multiDexPreferences.getInt(prefsKeyPrefix + KEY_DEX_NUMBER, 1); + int totalDexNumber = multiDexPreferences.getInt(prefsKeyPrefix + KEY_DEX_NUMBER, 0); + if (totalDexNumber < 1) { + // Guard against SharedPreferences corruption + throw new IOException("Invalid dex number: " + totalDexNumber); + } final List<ExtractedDex> files = new ArrayList<ExtractedDex>(totalDexNumber - 1); for (int secondaryNumber = 2; secondaryNumber <= totalDexNumber; secondaryNumber++) { |