tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
am: ac78ed8915

Change-Id: I7acad8d3ce6a71554e93d785e6a7e307e2c9f9fe
This commit is contained in:
Tao Bao 2017-04-26 16:56:32 +00:00 committed by android-build-merger
commit 282c863524
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
applypatch/imgpatch.cpp
View file

@ -100,7 +100,10 @@ int ApplyImagePatch(const unsigned char* old_data, size_t old_size, const Value*
printf("source data too short\n"); printf("source data too short\n");
return -1; 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) { } else if (type == CHUNK_RAW) {
const char* raw_header = &patch->data[pos]; const char* raw_header = &patch->data[pos];
pos += 4; pos += 4;