Merge pull request ceph#57409 from Suyashd999/fix-uam1

cbodley · web-flow · commit 2f6db3566e1e · 2024-05-21T18:32:07.000+01:00
current_status is being used after moving.

Reviewed-by: Yuval Lifshitz &lt;ylifshit@redhat.com&gt;
diff --git a/src/rgw/driver/rados/rgw_rest_log.cc b/src/rgw/driver/rados/rgw_rest_log.cc
@@ -1101,7 +1101,7 @@ void RGWOp_BILog_Status::execute(optional_yield y)
     }
 
     if (status.inc_status.empty()) {
-      status.inc_status = std::move(current_status);
+      std::swap(status.inc_status, current_status);
     } else {
       if (current_status.size() != status.inc_status.size()) {
         op_ret = -EINVAL;

Original file line number	Diff line number	Diff line change
`@@ -1101,7 +1101,7 @@ void RGWOp_BILog_Status::execute(optional_yield y)`
`1101`	`1101`	`}`
`1102`	`1102`
`1103`	`1103`	`if (status.inc_status.empty()) {`
`1104`		`- status.inc_status = std::move(current_status);`
	`1104`	`+ std::swap(status.inc_status, current_status);`
`1105`	`1105`	`} else {`
`1106`	`1106`	`if (current_status.size() != status.inc_status.size()) {`
`1107`	`1107`	`op_ret = -EINVAL;`