summaryrefslogtreecommitdiffstats
path: root/applypatch/imgpatch.cpp
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2017-05-19 00:20:55 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-05-19 00:20:55 +0200
commit0abe9860d8a6fcaa038a5c793ad9586547680423 (patch)
tree67e4b121c8a9ea059ee6e43472fa17a6f8b29920 /applypatch/imgpatch.cpp
parentMerge "libbootloader_message: convert to Android.bp" am: bec0d4cb94 am: 8226fd8926 (diff)
parentMerge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 (diff)
downloadandroid_bootable_recovery-0abe9860d8a6fcaa038a5c793ad9586547680423.tar
android_bootable_recovery-0abe9860d8a6fcaa038a5c793ad9586547680423.tar.gz
android_bootable_recovery-0abe9860d8a6fcaa038a5c793ad9586547680423.tar.bz2
android_bootable_recovery-0abe9860d8a6fcaa038a5c793ad9586547680423.tar.lz
android_bootable_recovery-0abe9860d8a6fcaa038a5c793ad9586547680423.tar.xz
android_bootable_recovery-0abe9860d8a6fcaa038a5c793ad9586547680423.tar.zst
android_bootable_recovery-0abe9860d8a6fcaa038a5c793ad9586547680423.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) {