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

Commit c0ae136b authored by Torne (Richard Coles)'s avatar Torne (Richard Coles) Committed by Android Git Automerger
Browse files

am 447da857: am e869b398: am 20272bec: am c207c943: am c5283927: Close... 

am 447da857: am e869b398: am 20272bec: am c207c943: am c5283927: Close ZipFiles correctly in WebViewFactory.

* commit '447da857':
  Close ZipFiles correctly in WebViewFactory.
parents 2757bda4 447da857

core/java/android/webkit/WebViewFactory.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -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);