diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-06-16 02:46:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-16 02:46:52 +0000 |
| commit | 475e596f95d26a235a8dab68fabdc70abdcee418 (patch) | |
| tree | 3c9ee91265f4ec3eaaa9c1587eba03dfdb5b8f2a | |
| parent | cc6af6925e49b0eec754ebfd72eacab2b3dbcab8 (diff) | |
| parent | 1ba1d50a4f324f9e19a3667d61ae305d988cd75d (diff) | |
| download | bsdiff-475e596f95d26a235a8dab68fabdc70abdcee418.tar.gz | |
Merge "Exit loop earlier for bsdiff's pathological case" am: d3f0369732 am: 6fd01a93b5 am: 1eec465beb am: f4333a2fa9 am: 6b68780b1f am: 1ba1d50a4fandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/2627658
Change-Id: Ic3234dfd39a2b0af1c49f1f96b4af4c11074e237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | bsdiff.cc | 2 | ||||
| -rw-r--r-- | patch_writer.cc | 5 |
2 files changed, 2 insertions, 5 deletions
@@ -119,7 +119,7 @@ int bsdiff(const uint8_t* old_buf, size_t oldsize, const uint8_t* new_buf, oldscore++; if(((len==oldscore) && (len!=0)) || - (len>oldscore+8 && len>=min_length)) break; + (len>=oldscore+8 && len>=min_length)) break; if((scan+lastoffset<oldsize) && (old_buf[scan+lastoffset] == new_buf[scan])) diff --git a/patch_writer.cc b/patch_writer.cc index b7d9b08..83bc531 100644 --- a/patch_writer.cc +++ b/patch_writer.cc @@ -13,10 +13,6 @@ #include "bsdiff/control_entry.h" #include "bsdiff/logging.h" -namespace { - - -} // namespace namespace bsdiff { @@ -43,6 +39,7 @@ bool BsdiffPatchWriter::InitializeCompressorList( LOG(ERROR) << "Patch writer expects at least one compressor."; return false; } + compressor_list->clear(); for (const auto& type : types_) { switch (type) { |