summaryrefslogtreecommitdiffstats
path: root/applypatch/bspatch.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-11-11 02:20:04 +0100
committerandroid-build-merger <android-build-merger@google.com>2017-11-11 02:20:04 +0100
commitefcd98da32e0c7add2b8974c3f1be919defd14a6 (patch)
treece4df2cd76753e689ae431290e2b140a41d0418c /applypatch/bspatch.cpp
parentMerge "Include bspatch.h from bsdiff/" am: 29cd3215ec (diff)
parentMerge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch." (diff)
downloadandroid_bootable_recovery-efcd98da32e0c7add2b8974c3f1be919defd14a6.tar
android_bootable_recovery-efcd98da32e0c7add2b8974c3f1be919defd14a6.tar.gz
android_bootable_recovery-efcd98da32e0c7add2b8974c3f1be919defd14a6.tar.bz2
android_bootable_recovery-efcd98da32e0c7add2b8974c3f1be919defd14a6.tar.lz
android_bootable_recovery-efcd98da32e0c7add2b8974c3f1be919defd14a6.tar.xz
android_bootable_recovery-efcd98da32e0c7add2b8974c3f1be919defd14a6.tar.zst
android_bootable_recovery-efcd98da32e0c7add2b8974c3f1be919defd14a6.zip
Diffstat (limited to 'applypatch/bspatch.cpp')
-rw-r--r--applypatch/bspatch.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/applypatch/bspatch.cpp b/applypatch/bspatch.cpp
index db2ce0896..912dbbdd8 100644
--- a/applypatch/bspatch.cpp
+++ b/applypatch/bspatch.cpp
@@ -65,7 +65,7 @@ void ShowBSDiffLicense() {
);
}
-int ApplyBSDiffPatch(const unsigned char* old_data, size_t old_size, const Value* patch,
+int ApplyBSDiffPatch(const unsigned char* old_data, size_t old_size, const Value& patch,
size_t patch_offset, SinkFn sink, SHA_CTX* ctx) {
auto sha_sink = [&sink, &ctx](const uint8_t* data, size_t len) {
len = sink(data, len);
@@ -73,22 +73,20 @@ int ApplyBSDiffPatch(const unsigned char* old_data, size_t old_size, const Value
return len;
};
- CHECK(patch != nullptr);
- CHECK_LE(patch_offset, patch->data.size());
+ CHECK_LE(patch_offset, patch.data.size());
int result = bsdiff::bspatch(old_data, old_size,
- reinterpret_cast<const uint8_t*>(&patch->data[patch_offset]),
- patch->data.size() - patch_offset, sha_sink);
+ reinterpret_cast<const uint8_t*>(&patch.data[patch_offset]),
+ patch.data.size() - patch_offset, sha_sink);
if (result != 0) {
LOG(ERROR) << "bspatch failed, result: " << result;
// print SHA1 of the patch in the case of a data error.
if (result == 2) {
uint8_t digest[SHA_DIGEST_LENGTH];
- SHA1(reinterpret_cast<const uint8_t*>(patch->data.data() + patch_offset),
- patch->data.size() - patch_offset, digest);
+ SHA1(reinterpret_cast<const uint8_t*>(patch.data.data() + patch_offset),
+ patch.data.size() - patch_offset, digest);
std::string patch_sha1 = print_sha1(digest);
- LOG(ERROR) << "Patch may be corrupted, offset: " << patch_offset << ", SHA1: "
- << patch_sha1;
+ LOG(ERROR) << "Patch may be corrupted, offset: " << patch_offset << ", SHA1: " << patch_sha1;
}
}
return result;