Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1eb9b6cd authored by Akilesh Kailash's avatar Akilesh Kailash Committed by Automerger Merge Worker
Browse files

Merge "libsnapshot:snapuserd: Fix off by one error in merge path" am: e4ebcaac 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1507553

Change-Id: I39123a9f916ac3cb82888405f5f8a49ebc8f93b7
parents 4d05c3e3 e4ebcaac

fs_mgr/libsnapshot/snapuserd.cpp

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ int Snapuserd::GetNumberOfMergedOps(void* merged_buffer, void* unmerged_buffer, 
    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 =