summaryrefslogtreecommitdiffstats
path: root/dalvik
diff options
context:
space:
mode:
authorAndy McFadden <fadden@android.com>2010-11-30 13:05:23 -0800
committerAndy McFadden <fadden@android.com>2010-11-30 13:05:23 -0800
commita2dc5f83493ea8f514ff8a8df4c85dcce6093d9f (patch)
treeeffcf86340f29763a8973dda505c845aacf164da /dalvik
parent302522534d302a679805174a0dcd8e6a19713cb1 (diff)
downloadlibcore-a2dc5f83493ea8f514ff8a8df4c85dcce6093d9f.zip
libcore-a2dc5f83493ea8f514ff8a8df4c85dcce6093d9f.tar.gz
libcore-a2dc5f83493ea8f514ff8a8df4c85dcce6093d9f.tar.bz2
Zero the cookie after close.
The cookie values can be re-used by the VM, so zero it out after closing the DexFile to ensure we don't try to close again in the finalizer. Bug 3238298 Change-Id: I2cc6a0d90ae9fbdff9c6a0f34a8031f36aa78e70
Diffstat (limited to 'dalvik')
-rw-r--r--dalvik/src/main/java/dalvik/system/DexFile.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/dalvik/src/main/java/dalvik/system/DexFile.java b/dalvik/src/main/java/dalvik/system/DexFile.java
index 0740f28..5c311d4 100644
--- a/dalvik/src/main/java/dalvik/system/DexFile.java
+++ b/dalvik/src/main/java/dalvik/system/DexFile.java
@@ -31,7 +31,7 @@ import java.util.Enumeration;
* read-only by the VM.
*/
public final class DexFile {
- private final int mCookie;
+ private int mCookie;
private final String mFileName;
private final CloseGuard guard = CloseGuard.get();
@@ -169,6 +169,7 @@ public final class DexFile {
public void close() throws IOException {
guard.close();
closeDexFile(mCookie);
+ mCookie = 0;
}
/**