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

am: 15cd392108 Change-Id: I63034776a185682f11ea736b0d37a4b3be31bc47
2016-12-07 01:54:13 +00:00
parent 472d5ecb5f 15cd392108
commit 3199d58939
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;
        }