commit b7218430f28a1a41d411f7d92bda193b31056bf5
author Amin Hassani <ahassani@google.com> Fri Jan 04 14:47:42 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Jan 04 14:47:42 2019 -0800
tree 2e1d8663ba585d5cd39b6c10c355ee5640e04487
parent 3b14be82de342e491146158c2d8d2007679aaee7
parent cf50e9dd45d93687282a8c0755d4b839136a0079

update_engine: Remove problematic deflate caches.
am: cf50e9dd45

Change-Id: Ie572d2207fe8c1bbf77a6582697236adb94e46f8

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;