| commit | 9af240b42407f6bd2dbd1a1c14e882b5dfbd37fc | [log] [tgz] |
|---|---|---|
| author | Daniel Zheng <zhengdaniel@google.com> | Fri Sep 15 02:11:08 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 02:11:08 2023 +0000 |
| tree | 8ef0540023e79f46b382bfd4d2509a78f1bc21ee | |
| parent | 457c96513d7b9e003c8088beef6eba0958c51345 [diff] | |
| parent | 1c6a4aaa1e2707e072592732228f0081deb9f95a [diff] |
Merge "Concatenate conditional" into main am: 5528777496 am: d9c17e91bb am: 1c6a4aaa1e Original change: https://android-review.googlesource.com/c/platform/system/core/+/2751931 Change-Id: I7c83e89bc19f26fca4daee369d0c04c90e8f146a 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; }