diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-03-05 19:13:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-05 19:13:53 +0000 |
| commit | f27f9e10f50a015ec2d76a2f3579a5d11932965e (patch) | |
| tree | 01273f30ad7f717cce9618dcfc45373d4b7820a8 | |
| parent | f21b6b9217efc86ae753e5c57a05ff05e631bd3e (diff) | |
| parent | 51ebffd8a5536af09b60950bf7cf6f020c962f8a (diff) | |
| download | system_core-f27f9e10f50a015ec2d76a2f3579a5d11932965e.zip system_core-f27f9e10f50a015ec2d76a2f3579a5d11932965e.tar.gz system_core-f27f9e10f50a015ec2d76a2f3579a5d11932965e.tar.bz2 | |
am 51ebffd8: Merge "Add free to CloseArchive."
* commit '51ebffd8a5536af09b60950bf7cf6f020c962f8a':
Add free to CloseArchive.
| -rw-r--r-- | libziparchive/zip_archive.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc index 8ef0962..01f9249 100644 --- a/libziparchive/zip_archive.cc +++ b/libziparchive/zip_archive.cc @@ -591,13 +591,7 @@ void CloseArchive(ZipArchiveHandle handle) { archive->directory_map->release(); } free(archive->hash_table); - - /* ensure nobody tries to use the ZipArchive after it's closed */ - archive->directory_offset = -1; - archive->fd = -1; - archive->num_entries = -1; - archive->hash_table_size = -1; - archive->hash_table = NULL; + free(archive); } static int32_t UpdateEntryFromDataDescriptor(int fd, |