commit 34e03bdfdf3defc667eab68f126ad3370547159a
author Piotr Jastrzebski <haaawk@google.com> Fri Aug 08 15:59:12 2014 +0100
committer Piotr Jastrzebski <haaawk@google.com> Mon Aug 11 14:20:24 2014 +0100
tree 8e75d4d0eca9d2a4f2d763cfd26cbd79a1b4534c
parent 400e73720c12fab85f4ff8a08a5c7e87c12d5f9a

Make a copy of a prefix param in StartIteration

and delete it in EndIteration.

Change-Id: I4de4167700a9dba3119fde22fcd45725742f3731

libziparchive/zip_archive.cc

diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc
index 366fb24..a29eb79 100644
--- a/libziparchive/zip_archive.cc
+++ b/libziparchive/zip_archive.cc
@@ -899,10 +899,12 @@
 
   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 @@
 
 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);
   }
 }