pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix memory leak in test util"

This commit is contained in:
Kenny Root 2016-09-15 19:12:46 +00:00 committed by Gerrit Code Review
parent 57a4e8d1fe f0cccdbe19
commit b32184eb84
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/libs/Android.bp
View File

@ -441,10 +441,4 @@ cc_binary_host {
"libz", "libz",
"libutils", "libutils",
], ],
target: {
windows: {
enabled: true,
},
},
} }

12
tests/libs/bionic_tests_zipalign.cpp
View File

@ -19,6 +19,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <algorithm> #include <algorithm>
#include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
@ -36,7 +37,7 @@ static void usage() {
fprintf(stderr, " The output zip file that will be created from the input file.\n"); fprintf(stderr, " The output zip file that will be created from the input file.\n");
} }
typedef std::pair<ZipEntry*, ZipString*> ZipData; using ZipData = std::pair<std::unique_ptr<ZipEntry>, std::unique_ptr<ZipString>>;
static bool GetEntries(ZipArchiveHandle handle, std::vector<ZipData>* entries) { static bool GetEntries(ZipArchiveHandle handle, std::vector<ZipData>* entries) {
void* cookie; void* cookie;
@ -49,14 +50,15 @@ static bool GetEntries(ZipArchiveHandle handle, std::vector<ZipData>* entries) {
ZipEntry entry; ZipEntry entry;
ZipString name; ZipString name;
while ((return_value = Next(cookie, &entry, &name)) == 0) { while ((return_value = Next(cookie, &entry, &name)) == 0) {
entries->push_back(std::make_pair(new ZipEntry(entry), new ZipString(name))); entries->emplace_back(std::make_pair(std::make_unique<ZipEntry>(entry),
std::make_unique<ZipString>(name)));
} }
if (return_value != -1) { if (return_value != -1) {
fprintf(stderr, "Error while iterating over zip entries: %s\n", ErrorCodeString(return_value)); fprintf(stderr, "Error while iterating over zip entries: %s\n", ErrorCodeString(return_value));
} else { } else {
// Sort by offset. // Sort by offset.
std::sort(entries->begin(), entries->end(), std::sort(entries->begin(), entries->end(),
[](ZipData a, ZipData b) { return a.first->offset < b.first->offset; }); [](ZipData& a, ZipData& b) { return a.first->offset < b.first->offset; });
} }
EndIteration(cookie); EndIteration(cookie);
@ -75,8 +77,8 @@ static bool CreateAlignedZip(ZipArchiveHandle& handle, FILE* zip_dst, uint32_t a
int32_t error; int32_t error;
for (auto& entry : entries) { for (auto& entry : entries) {
ZipEntry* zip_entry = entry.first; ZipEntry* zip_entry = entry.first.get();
ZipString* zip_str = entry.second; ZipString* zip_str = entry.second.get();
size_t flags = 0; size_t flags = 0;
if ((zip_entry->method & kCompressDeflated) != 0) { if ((zip_entry->method & kCompressDeflated) != 0) {