Make a copy of a prefix param in StartIteration

and delete it in EndIteration. Change-Id: I4de4167700a9dba3119fde22fcd45725742f3731
S5-13 · Aug 11, 2014 · 34e03bd · 34e03bd
1 parent 400e737
commit 34e03bd
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc
@@ -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);
   }
 }