openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am f36a2311: am 3e13ed08: Merge "Cleanup ziparchive" 

* commit 'f36a2311ab7232e0b91dc009a3a2d1d9c8130c37':
  Cleanup ziparchive
This commit is contained in:
Piotr Jastrzebski 2014-08-19 10:14:45 +00:00 committed by Android Git Automerger
parent b2a2acfaa6 f36a2311ab
commit 134f443696
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libziparchive/zip_archive.cc
View File

@ -888,6 +888,8 @@ static int32_t FindEntry(const ZipArchive* archive, const int ent,
struct IterationHandle {
uint32_t position;
// We're not using vector here because this code is used in the Windows SDK
// where the STL is not available.
const uint8_t* prefix;
uint16_t prefix_len;
ZipArchive* archive;
@ -897,13 +899,12 @@ struct IterationHandle {
IterationHandle(const ZipEntryName& prefix_name)
: prefix_len(prefix_name.name_length) {
uint8_t* prefix_copy = new uint8_t[prefix_len];
memcpy(reinterpret_cast<void*>(prefix_copy), prefix_name.name,
prefix_len * sizeof(uint8_t));
memcpy(prefix_copy, prefix_name.name, prefix_len);
prefix = prefix_copy;
}
~IterationHandle() {
delete [] prefix;
delete[] prefix;
}
};