ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Make a copy of a prefix param in StartIteration"

Browse source
This commit is contained in:
Piotr Jastrzebski 2014-08-11 13:31:38 +00:00 • committed by Gerrit Code Review
commit 8750fa7609
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libziparchive/zip_archive.cc
View file

@ -899,10 +899,12 @@ int32_t StartIteration(ZipArchiveHandle handle, void** cookie_ptr, const char* p
IterationHandle* cookie = (IterationHandle*) malloc(sizeof(IterationHandle));
cookie->position = 0;
cookie->prefix = prefix;
cookie->archive = archive;
if (prefix != NULL) {
cookie->prefix = strdup(prefix);
cookie->prefix_len = strlen(prefix);
} else {
cookie->prefix = NULL;
}
*cookie_ptr = cookie ;
@ -911,6 +913,10 @@ int32_t StartIteration(ZipArchiveHandle handle, void** cookie_ptr, const char* p
void EndIteration(void* cookie) {
if (cookie != NULL) {
IterationHandle* handle = reinterpret_cast<IterationHandle*>(cookie);
if (handle->prefix != NULL) {
free(const_cast<char*>(handle->prefix));
}
free(cookie);
}
}