commit ac78ed89156ad6f08178afcc66f1eb3b0adc449f
author Tao Bao <tbao@google.com> Wed Apr 26 16:49:06 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 26 16:49:08 2017 +0000
tree b47d8fd943dd8ea3b3753839d3b9afd5acc8e043
parent 7b1fffe095c0374f2aba33a3a3155ba845105208
parent 391bb7bb924a1b0a7990a8a7e2875ee94387e73d

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

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;