summaryrefslogtreecommitdiffstats
path: root/applypatch/imgpatch.cpp
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-05-21 09:37:56 +0200
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-05-21 09:37:56 +0200
commitff352784932fc699a4954f1276b3b62b41450dc6 (patch)
treef6b0e942d094d038558c69f010b11cadf8d62c06 /applypatch/imgpatch.cpp
parentrelease-request-0520ccd3-e696-4d2d-993b-af952b2dd6bd-for-git_oc-mr1-release-4022446 snap-temp-L69600000065417142 (diff)
parentMerge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 am: 8f68accc9d am: 1562f41348 (diff)
downloadandroid_bootable_recovery-ff352784932fc699a4954f1276b3b62b41450dc6.tar
android_bootable_recovery-ff352784932fc699a4954f1276b3b62b41450dc6.tar.gz
android_bootable_recovery-ff352784932fc699a4954f1276b3b62b41450dc6.tar.bz2
android_bootable_recovery-ff352784932fc699a4954f1276b3b62b41450dc6.tar.lz
android_bootable_recovery-ff352784932fc699a4954f1276b3b62b41450dc6.tar.xz
android_bootable_recovery-ff352784932fc699a4954f1276b3b62b41450dc6.tar.zst
android_bootable_recovery-ff352784932fc699a4954f1276b3b62b41450dc6.zip
Diffstat (limited to 'applypatch/imgpatch.cpp')
-rw-r--r--applypatch/imgpatch.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/applypatch/imgpatch.cpp b/applypatch/imgpatch.cpp
index 3d905f7b4..702a624ae 100644
--- a/applypatch/imgpatch.cpp
+++ b/applypatch/imgpatch.cpp
@@ -200,12 +200,14 @@ int ApplyImagePatch(const unsigned char* old_data, size_t old_size, const Value*
}
// Next, apply the bsdiff patch (in memory) to the uncompressed data.
- std::vector<unsigned char> uncompressed_target_data;
- // TODO(senj): Remove the only usage of ApplyBSDiffPatchMem here,
- // replace it with ApplyBSDiffPatch with a custom sink function that
- // wraps the given sink function to stream output to save memory.
- if (ApplyBSDiffPatchMem(expanded_source.data(), expanded_len, patch, patch_offset,
- &uncompressed_target_data) != 0) {
+ std::vector<uint8_t> uncompressed_target_data;
+ // TODO: replace the custom sink function passed into ApplyBSDiffPatch so that it wraps the
+ // given sink function to stream output to save memory.
+ if (ApplyBSDiffPatch(expanded_source.data(), expanded_len, patch, patch_offset,
+ [&uncompressed_target_data](const uint8_t* data, size_t len) {
+ uncompressed_target_data.insert(uncompressed_target_data.end(), data, data + len);
+ return len;
+ }, nullptr) != 0) {
return -1;
}
if (uncompressed_target_data.size() != target_len) {