Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Close ZipFiles correctly in WebViewFactory.

Browse Source 
We weren't closing the ZipFiles created in WebViewFactory to check
inside APKs - use try-with-resources to get them closed automatically.

Bug: 23072621
Change-Id: I11c6b77e960a7d240d19d22240cac177b6ba27b2
This commit is contained in:
Torne (Richard Coles)
2015-08-10 16:40:50 +01:00
parent 4218e46a32
commit c52839277b
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/WebViewFactory.java
View File

@@ -314,8 +314,7 @@ public final class WebViewFactory {
if (path.contains("!/")) { if (path.contains("!/")) {
String[] split = TextUtils.split(path, "!/"); String[] split = TextUtils.split(path, "!/");
if (split.length == 2) { if (split.length == 2) {
try { try (ZipFile z = new ZipFile(split[0])) {
ZipFile z = new ZipFile(split[0]);
ZipEntry e = z.getEntry(split[1]); ZipEntry e = z.getEntry(split[1]);
if (e != null && e.getMethod() == ZipEntry.STORED) { if (e != null && e.getMethod() == ZipEntry.STORED) {
newVmSize = Math.max(newVmSize, e.getSize()); newVmSize = Math.max(newVmSize, e.getSize());
@@ -355,8 +354,7 @@ public final class WebViewFactory {
String[] abiList, String[] abiList,
String nativeLibFileName) { String nativeLibFileName) {
// Search the APK for a native library conforming to a listed ABI. // Search the APK for a native library conforming to a listed ABI.
try { try (ZipFile z = new ZipFile(apkPath)) {
ZipFile z = new ZipFile(apkPath);
for (String abi : abiList) { for (String abi : abiList) {
final String entry = "lib/" + abi + "/" + nativeLibFileName; final String entry = "lib/" + abi + "/" + nativeLibFileName;
ZipEntry e = z.getEntry(entry); ZipEntry e = z.getEntry(entry);