Merge "Fix crashing StrictJarFile due to doubled closing." am: 68ea36243d am: 15cd392108

am: 3199d58939 Change-Id: I269b4a0a7fcbb30804a3dd39870cce927c2b9596
2016-12-07 02:01:12 +00:00
parent 9347a4f38f 3199d58939
commit 37541865f3
1 changed files with 1 additions and 0 deletions
--- a/core/java/android/util/jar/StrictJarFile.java
+++ b/core/java/android/util/jar/StrictJarFile.java
@@ -134,6 +134,7 @@ public final class StrictJarFile {
        } catch (IOException | SecurityException e) {
            nativeClose(this.nativeHandle);
            IoUtils.closeQuietly(fd);
+            closed = true;
            throw e;
        }