summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2016-06-16 20:11:47 +0200
committerandroid-build-merger <android-build-merger@google.com>2016-06-16 20:11:47 +0200
commit24488eb7dbb70fedaba778c569b577249ce6b0cf (patch)
tree344912bf7b792cac62ea854f48724841767cd81a
parenttests: Remove obsolete MTD support. am: 7eb60efa8d (diff)
parentCheck the results from applypatch (diff)
downloadandroid_bootable_recovery-24488eb7dbb70fedaba778c569b577249ce6b0cf.tar
android_bootable_recovery-24488eb7dbb70fedaba778c569b577249ce6b0cf.tar.gz
android_bootable_recovery-24488eb7dbb70fedaba778c569b577249ce6b0cf.tar.bz2
android_bootable_recovery-24488eb7dbb70fedaba778c569b577249ce6b0cf.tar.lz
android_bootable_recovery-24488eb7dbb70fedaba778c569b577249ce6b0cf.tar.xz
android_bootable_recovery-24488eb7dbb70fedaba778c569b577249ce6b0cf.tar.zst
android_bootable_recovery-24488eb7dbb70fedaba778c569b577249ce6b0cf.zip
-rw-r--r--updater/blockimg.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index 7aff7fff7..f00bc4bff 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -1264,11 +1264,17 @@ static int PerformCommandDiff(CommandParameters& params) {
}
if (params.cmdname[0] == 'i') { // imgdiff
- ApplyImagePatch(params.buffer.data(), blocks * BLOCKSIZE, &patch_value,
- &RangeSinkWrite, &rss, nullptr, nullptr);
+ if (ApplyImagePatch(params.buffer.data(), blocks * BLOCKSIZE, &patch_value,
+ &RangeSinkWrite, &rss, nullptr, nullptr) != 0) {
+ fprintf(stderr, "Failed to apply image patch.\n");
+ return -1;
+ }
} else {
- ApplyBSDiffPatch(params.buffer.data(), blocks * BLOCKSIZE, &patch_value, 0,
- &RangeSinkWrite, &rss, nullptr);
+ if (ApplyBSDiffPatch(params.buffer.data(), blocks * BLOCKSIZE, &patch_value,
+ 0, &RangeSinkWrite, &rss, nullptr) != 0) {
+ fprintf(stderr, "Failed to apply bsdiff patch.\n");
+ return -1;
+ }
}
// We expect the output of the patcher to fill the tgt ranges exactly.