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