Merge "Exit loop earlier for bsdiff's pathological case" am: d3f0369732
Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/2627658
Change-Id: I94ba5bacb5bdf763cc31816aad957680e9ef7435
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/bsdiff.cc b/bsdiff.cc
index 8bb21b7..a1112d5 100644
--- a/bsdiff.cc
+++ b/bsdiff.cc
@@ -119,7 +119,7 @@
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 @@
LOG(ERROR) << "Patch writer expects at least one compressor.";
return false;
}
+ compressor_list->clear();
for (const auto& type : types_) {
switch (type) {
