bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

s3/client: do not allocate potentially big object on stack

Browse Source 
when compiling using GCC-13, it warns that:

```
/home/kefu/dev/scylladb/utils/s3/client.cc:224:9: error: stack usage might be 66352 bytes [-Werror=stack-usage=]
  224 | sstring parse_multipart_upload_id(sstring& body) {
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~
```

so it turns out that `rapidxml::xml_document<>` could be very large,
let's allocate it on heap instead of on the stack to address this issue.

Signed-off-by: Kefu Chai <kefu.chai@scylladb.com>

Closes #13722
This commit is contained in:
Kefu Chai
2023-04-29 16:23:18 +08:00
committed by Avi Kivity
parent 108f20c684
commit 37f1beade5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utils/s3/client.cc
View File

@@ -6,6 +6,7 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
#include <memory>
#include <rapidxml.h>
#include <seastar/core/coroutine.hh>
#include <seastar/core/semaphore.hh>
@@ -222,16 +223,16 @@ future<> client::upload_sink::do_flush() {
}
sstring parse_multipart_upload_id(sstring& body) {
rapidxml::xml_document<> doc;
auto doc = std::make_unique<rapidxml::xml_document<>>();
try {
doc.parse<0>(body.data());
doc->parse<0>(body.data());
} catch (const rapidxml::parse_error& e) {
s3l.warn("cannot parse initiate multipart upload response: {}", e.what());
// The caller is supposed to check the upload-id to be empty
// and handle the error the way it prefers
return "";
}
auto root_node = doc.first_node("InitiateMultipartUploadResult");
auto root_node = doc->first_node("InitiateMultipartUploadResult");
auto uploadid_node = root_node->first_node("UploadId");
return uploadid_node->value();
}