| commit | 89d22239d28c69daeb1b47f3200044dbe6fea60e | [log] [tgz] |
|---|---|---|
| author | David Anderson <dvander@google.com> | Thu Jul 20 16:23:08 2023 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Jul 20 16:23:08 2023 +0000 |
| tree | d7a2144c99f61794ec9d187c9677a2fd056fdee0 | |
| parent | 998c3b4fbe4347cbdded73b09bb63bb84e2a430f [diff] | |
| parent | e1132a9c2ff5a039fcdd33694fe42bd245d2fca8 [diff] |
Merge "snapuserd: Fix ubsan when reading a single aligned sector." into main
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp index 7268fca..7d2e3a6 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/read_worker.cpp
@@ -305,7 +305,7 @@ return false; } - ret = BLOCK_SZ; + ret = std::min(BLOCK_SZ, read_size); } read_size -= ret;