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

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

Change-Id: I1465b5194faa9ff8f17327281c5a6a5186538405
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Anderson 2023-07-20 16:55:52 +00:00 committed by Automerger Merge Worker
commit 1eb661531e

View file

@ -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;