diff options
| author | Tianjie Xu <xunchang@google.com> | 2016-06-16 20:09:19 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-16 20:09:19 +0200 |
| commit | d0dcbddd3170e5499beefddd098d9a332e506d11 (patch) | |
| tree | 17fa6037d317137c07bdca033316011470d0a849 | |
| parent | applypatch: Don\'t call inflate() when it expects zero-length output. (diff) | |
| parent | Check the results from applypatch (diff) | |
| download | android_bootable_recovery-d0dcbddd3170e5499beefddd098d9a332e506d11.tar android_bootable_recovery-d0dcbddd3170e5499beefddd098d9a332e506d11.tar.gz android_bootable_recovery-d0dcbddd3170e5499beefddd098d9a332e506d11.tar.bz2 android_bootable_recovery-d0dcbddd3170e5499beefddd098d9a332e506d11.tar.lz android_bootable_recovery-d0dcbddd3170e5499beefddd098d9a332e506d11.tar.xz android_bootable_recovery-d0dcbddd3170e5499beefddd098d9a332e506d11.tar.zst android_bootable_recovery-d0dcbddd3170e5499beefddd098d9a332e506d11.zip | |
| -rw-r--r-- | updater/blockimg.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp index f7955566d..a80180a9a 100644 --- a/updater/blockimg.cpp +++ b/updater/blockimg.cpp @@ -1267,11 +1267,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. |