commit 55287774960666ce3d1b27ee593c70b3a582d062
author Daniel Zheng <zhengdaniel@google.com> Thu Sep 14 23:42:15 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 14 23:42:15 2023 +0000
tree d5a567b5b97a073b35e104ab9dba51510b599397
parent 358a982b7169104736a8025fa1799327fa124f4f
parent 19a6aa624174f5c21a2e57773c7e1faa5979117c

Merge "Concatenate conditional" into main

fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.cpp

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