PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "applypatch: Fix the bug when constructing VAL_BLOB." am: e1991428ba

Browse Source 
am: 565273839e

Change-Id: I1c235a75e711a9859831cab9b311ea3304ee8e61
This commit is contained in:
Tao Bao
2016-10-25 02:52:55 +00:00
committed by android-build-merger
parent 5e0b587896 565273839e
commit 6d9f8993b0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applypatch/main.cpp
+3 -2
View File
@@ -99,7 +99,7 @@ static int PatchMode(int argc, char** argv) {
return 1; return 1;
} }
bonus.type = VAL_BLOB; bonus.type = VAL_BLOB;
bonus.data = reinterpret_cast<const char*>(bonusFc.data.data()); bonus.data = std::string(bonusFc.data.cbegin(), bonusFc.data.cend());
argc -= 2; argc -= 2;
argv += 2; argv += 2;
} }
@@ -132,7 +132,8 @@ static int PatchMode(int argc, char** argv) {
std::vector<Value> patches; std::vector<Value> patches;
std::vector<Value*> patch_ptrs; std::vector<Value*> patch_ptrs;
for (size_t i = 0; i < files.size(); ++i) { for (size_t i = 0; i < files.size(); ++i) {
patches.push_back(Value(VAL_BLOB, reinterpret_cast<const char*>(files[i].data.data()))); patches.push_back(Value(VAL_BLOB,
std::string(files[i].data.cbegin(), files[i].data.cend())));
patch_ptrs.push_back(&patches[i]); patch_ptrs.push_back(&patches[i]);
} }
return applypatch(argv[1], argv[2], argv[3], target_size, return applypatch(argv[1], argv[2], argv[3], target_size,