| commit | 1eb9b6cd21282af558fdd870b952c786da92ed26 | [log] [tgz] |
|---|---|---|
| author | Akilesh Kailash <akailash@google.com> | Mon Nov 23 07:03:23 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 23 07:03:23 2020 +0000 |
| tree | da616d9ce5e250f436b9dc0ac861be379c459fe8 | |
| parent | 4d05c3e3f0eaca379b991a34f50e9da6cd498dc7 [diff] | |
| parent | e4ebcaac08faa4fd5037161bc59e5b1c50d784db [diff] |
Merge "libsnapshot:snapuserd: Fix off by one error in merge path" am: e4ebcaac08 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1507553 Change-Id: I39123a9f916ac3cb82888405f5f8a49ebc8f93b7
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 =