| commit | 6d4b6b5b0d653ac991a38a0a4232ebce739a02f7 | [log] [tgz] |
|---|---|---|
| author | Daniel Zheng <zhengdaniel@google.com> | Fri Sep 15 03:57:10 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 03:57:10 2023 +0000 |
| tree | 1287b133b4a07d3ac903cfe61caf4b4e9de696f3 | |
| parent | 9c63339cb3e9d971e00a60433de21c0d22805a64 [diff] | |
| parent | 4b8413e03b7a3495fcb4e24dd310a180ec5eb611 [diff] |
Merge "Concatenate conditional" into main am: 5528777496 am: d9c17e91bb am: 1c6a4aaa1e am: 9af240b424 am: 4b8413e03b Original change: https://android-review.googlesource.com/c/platform/system/core/+/2751931 Change-Id: I3fcc4253aaa765d547a9dde1f65292e1d40be709 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp b/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp index ee445a2..699529b 100644 --- a/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp +++ b/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp
@@ -636,10 +636,8 @@ } bool CowWriterV2::WriteOperation(const CowOperation& op, const void* data, size_t size) { - if (!EnsureSpaceAvailable(next_op_pos_ + sizeof(op))) { - return false; - } - if (!EnsureSpaceAvailable(next_data_pos_ + size)) { + if (!EnsureSpaceAvailable(next_op_pos_ + sizeof(op)) || + !EnsureSpaceAvailable(next_data_pos_ + size)) { return false; }