| commit | 597e503df675282ac5014eace078183673cc8b01 | [log] [tgz] |
|---|---|---|
| author | Akilesh Kailash <akailash@google.com> | Mon Nov 23 07:50:04 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 23 07:50:04 2020 +0000 |
| tree | e211198cd11b49140c6b72d863ff6ae5c24b2690 | |
| parent | 5596c26e88c9ee53867c80f6fc9b8821746c62c0 [diff] | |
| parent | 1eb9b6cd21282af558fdd870b952c786da92ed26 [diff] |
Merge "libsnapshot:snapuserd: Fix off by one error in merge path" am: e4ebcaac08 am: 1eb9b6cd21 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1507553 Change-Id: I33168cadb52ca7074d5fcb6466682119c8f708ac
diff --git a/fs_mgr/libsnapshot/snapuserd.cpp b/fs_mgr/libsnapshot/snapuserd.cpp index 3abc457..49e6c3d 100644 --- a/fs_mgr/libsnapshot/snapuserd.cpp +++ b/fs_mgr/libsnapshot/snapuserd.cpp
@@ -334,7 +334,7 @@ int merged_ops_cur_iter = 0; // Find the operations which are merged in this cycle. - while ((unmerged_exceptions + merged_ops_cur_iter) <= exceptions_per_area_) { + while ((unmerged_exceptions + merged_ops_cur_iter) < exceptions_per_area_) { struct disk_exception* merged_de = reinterpret_cast<struct disk_exception*>((char*)merged_buffer + offset); struct disk_exception* cow_de =