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

Commit 945feca8 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "snapuserd: Fix ubsan when reading a single aligned sector." into main... 

Merge "snapuserd: Fix ubsan when reading a single aligned sector." into main am: 89d22239 am: 1eb66153 am: 3f702145 am: 1568605c am: 08a03e73

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



Change-Id: Ic4b3fb8a8799c8489bb305caae731701d8abde04
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 58ce74c5 08a03e73

fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ bool ReadWorker::ReadAlignedSector(sector_t sector, size_t sz) { 
                    return false;

                }



                ret = BLOCK_SZ;

                ret = std::min(BLOCK_SZ, read_size);

            }



            read_size -= ret;