Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5283927 authored by Torne (Richard Coles)'s avatar Torne (Richard Coles)
Browse files

Close ZipFiles correctly in WebViewFactory. 

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
parent 4218e46a

core/java/android/webkit/WebViewFactory.java

+2 −4
Original line number Diff line number Diff line
@@ -314,8 +314,7 @@ public final class WebViewFactory { 
                    if (path.contains("!/")) {

                        String[] split = TextUtils.split(path, "!/");

                        if (split.length == 2) {

                            try {

                                ZipFile z = new ZipFile(split[0]);

                            try (ZipFile z = new ZipFile(split[0])) {

                                ZipEntry e = z.getEntry(split[1]);

                                if (e != null && e.getMethod() == ZipEntry.STORED) {

                                    newVmSize = Math.max(newVmSize, e.getSize());
@@ -355,8 +354,7 @@ public final class WebViewFactory { 
                                             String[] abiList,

                                             String nativeLibFileName) {

        // Search the APK for a native library conforming to a listed ABI.

        try {

            ZipFile z = new ZipFile(apkPath);

        try (ZipFile z = new ZipFile(apkPath)) {

            for (String abi : abiList) {

                final String entry = "lib/" + abi + "/" + nativeLibFileName;

                ZipEntry e = z.getEntry(entry);