summaryrefslogtreecommitdiffstats
path: root/applypatch/imgpatch.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-06-20 00:56:49 +0200
committerTao Bao <tbao@google.com>2018-07-10 08:20:30 +0200
commit511d75962789837231459e53e86eaaa6a1ff6e06 (patch)
tree25e167440b5c06697a6b91640afd71be2fd965a6 /applypatch/imgpatch.cpp
parentMerge "applypatch: Restrict applypatch_check to eMMC targets." (diff)
downloadandroid_bootable_recovery-511d75962789837231459e53e86eaaa6a1ff6e06.tar
android_bootable_recovery-511d75962789837231459e53e86eaaa6a1ff6e06.tar.gz
android_bootable_recovery-511d75962789837231459e53e86eaaa6a1ff6e06.tar.bz2
android_bootable_recovery-511d75962789837231459e53e86eaaa6a1ff6e06.tar.lz
android_bootable_recovery-511d75962789837231459e53e86eaaa6a1ff6e06.tar.xz
android_bootable_recovery-511d75962789837231459e53e86eaaa6a1ff6e06.tar.zst
android_bootable_recovery-511d75962789837231459e53e86eaaa6a1ff6e06.zip
Diffstat (limited to 'applypatch/imgpatch.cpp')
-rw-r--r--applypatch/imgpatch.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/applypatch/imgpatch.cpp b/applypatch/imgpatch.cpp
index 2f8f4851d..da7569219 100644
--- a/applypatch/imgpatch.cpp
+++ b/applypatch/imgpatch.cpp
@@ -151,7 +151,8 @@ static bool ApplyBSDiffPatchAndStreamOutput(const uint8_t* src_data, size_t src_
int ApplyImagePatch(const unsigned char* old_data, size_t old_size, const unsigned char* patch_data,
size_t patch_size, SinkFn sink) {
- Value patch(VAL_BLOB, std::string(reinterpret_cast<const char*>(patch_data), patch_size));
+ Value patch(Value::Type::BLOB,
+ std::string(reinterpret_cast<const char*>(patch_data), patch_size));
return ApplyImagePatch(old_data, old_size, patch, sink, nullptr);
}
@@ -246,11 +247,10 @@ int ApplyImagePatch(const unsigned char* old_data, size_t old_size, const Value&
// Decompress the source data; the chunk header tells us exactly
// how big we expect it to be when decompressed.
- // Note: expanded_len will include the bonus data size if
- // the patch was constructed with bonus data. The
- // deflation will come up 'bonus_size' bytes short; these
- // must be appended from the bonus_data value.
- size_t bonus_size = (i == 1 && bonus_data != NULL) ? bonus_data->data.size() : 0;
+ // Note: expanded_len will include the bonus data size if the patch was constructed with
+ // bonus data. The deflation will come up 'bonus_size' bytes short; these must be appended
+ // from the bonus_data value.
+ size_t bonus_size = (i == 1 && bonus_data != nullptr) ? bonus_data->data.size() : 0;
std::vector<unsigned char> expanded_source(expanded_len);
@@ -288,7 +288,7 @@ int ApplyImagePatch(const unsigned char* old_data, size_t old_size, const Value&
inflateEnd(&strm);
if (bonus_size) {
- memcpy(expanded_source.data() + (expanded_len - bonus_size), &bonus_data->data[0],
+ memcpy(expanded_source.data() + (expanded_len - bonus_size), bonus_data->data.data(),
bonus_size);
}
}