commit 50f3cb4d46c6635daacbf21be92fd6d7d4f540f2
author The Android Automerger <android-build@google.com> Sun Jun 19 00:02:53 2016 -0700
committer The Android Automerger <android-build@google.com> Sun Jun 19 00:02:53 2016 -0700
tree 5358e7b58485548550f180935158644f9c716e84
parent 31f8cc84cfc14eecdd96c6ca8eb411aa8610db22
parent de0f93069dda37f7ff68d426b6d01f5762ecd97a

merge in nyc-release history after reset to nyc-dev

updater/blockimg.cpp

diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index f795556..a80180a 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -1267,11 +1267,17 @@
             }
 
             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.