commit 3dcc24490b09eb1fab9605919a9b898c034552f9
author Tao Bao <tbao@google.com> Wed Apr 26 17:02:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 26 17:02:34 2017 +0000
tree f44fd4cf09d826f501ae2d596ade5156942239d5
parent c798cf253121d6a26a7d96dc2e750e6aa187b269
parent 282c863524d9565d38e320e649101dcff30a8075

Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow." am: ac78ed8915
am: 282c863524

Change-Id: I4e9e5c6411b9ac58568bb7ea9491f533bf934bfc

applypatch/imgpatch.cpp

diff --git a/applypatch/imgpatch.cpp b/applypatch/imgpatch.cpp
index 7d8b736..3d905f7 100644
--- a/applypatch/imgpatch.cpp
+++ b/applypatch/imgpatch.cpp
@@ -100,7 +100,10 @@
         printf("source data too short\n");
         return -1;
       }
-      ApplyBSDiffPatch(old_data + src_start, src_len, patch, patch_offset, sink, ctx);
+      if (ApplyBSDiffPatch(old_data + src_start, src_len, patch, patch_offset, sink, ctx) != 0) {
+        printf("Failed to apply bsdiff patch.\n");
+        return -1;
+      }
     } else if (type == CHUNK_RAW) {
       const char* raw_header = &patch->data[pos];
       pos += 4;