commit 09cde657c9b0655734f1fb90e11363ef5696f456
author Amin Hassani <ahassani@google.com> Fri Jan 04 15:02:58 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Jan 04 15:02:58 2019 -0800
tree fe83e882e852fa3aae1ae7821eef429dbe791bea
parent 40ee5a642426c79ed178c8375dcdad0cbf7956b2
parent dc97274a3c09eee8e84f34976fbc4ec8e22d6af4

update_engine: Remove problematic deflate caches. am: cf50e9dd45 am: b7218430f2
am: dc97274a3c

Change-Id: I0c27be49bb2da00381b6306a5e74fd98a7dfcfc2

payload_generator/delta_diff_utils.cc

diff --git a/payload_generator/delta_diff_utils.cc b/payload_generator/delta_diff_utils.cc
index d3629ff..f93fb55 100644
--- a/payload_generator/delta_diff_utils.cc
+++ b/payload_generator/delta_diff_utils.cc
@@ -937,6 +937,15 @@
         puffin::RemoveEqualBitExtents(
             old_data, new_data, &src_deflates, &dst_deflates);
 
+        // See crbug.com/915559.
+        if (version.minor <= kPuffdiffMinorPayloadVersion) {
+          TEST_AND_RETURN_FALSE(puffin::RemoveDeflatesWithBadDistanceCaches(
+              old_data, &src_deflates));
+
+          TEST_AND_RETURN_FALSE(puffin::RemoveDeflatesWithBadDistanceCaches(
+              new_data, &dst_deflates));
+        }
+
         // Only Puffdiff if both files have at least one deflate left.
         if (!src_deflates.empty() && !dst_deflates.empty()) {
           brillo::Blob puffdiff_delta;