lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

libstore: always allocate TransferItem::req

Browse source 
there's no reason not to do this. also improve error handling a bit.

Change-Id: I35853a919fa58a9a34ad47ffab6de77ba6f7fb86
This commit is contained in:
eldritch horrors 2024-10-27 18:27:11 +01:00
parent 982d049d3b
commit c82407fc1e
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libstore/filetransfer.cc
View file

@ -55,7 +55,7 @@ struct curlFileTransfer : public FileTransfer
std::pair<FileTransferResult, std::string>(std::exception_ptr, FileTransferResult)> std::pair<FileTransferResult, std::string>(std::exception_ptr, FileTransferResult)>
callback; callback;
std::function<void(TransferItem &, std::string_view data)> dataCallback; std::function<void(TransferItem &, std::string_view data)> dataCallback;
CURL * req = 0; CURL * req; // must never be nullptr
bool active = false; // whether the handle has been added to the multi object bool active = false; // whether the handle has been added to the multi object
std::string statusMsg; std::string statusMsg;
@ -113,7 +113,11 @@ struct curlFileTransfer : public FileTransfer
return std::pair{std::move(r), std::move(downloadData)}; return std::pair{std::move(r), std::move(downloadData)};
}) })
, dataCallback(std::move(dataCallback)) , dataCallback(std::move(dataCallback))
, req(curl_easy_init())
{ {
if (req == nullptr) {
throw FileTransferError(Misc, {}, "could not allocate curl handle");
}
requestHeaders = curl_slist_append(requestHeaders, "Accept-Encoding: zstd, br, gzip, deflate, bzip2, xz"); requestHeaders = curl_slist_append(requestHeaders, "Accept-Encoding: zstd, br, gzip, deflate, bzip2, xz");
for (auto it = headers.begin(); it != headers.end(); ++it){ for (auto it = headers.begin(); it != headers.end(); ++it){
requestHeaders = curl_slist_append(requestHeaders, fmt("%s: %s", it->first, it->second).c_str()); requestHeaders = curl_slist_append(requestHeaders, fmt("%s: %s", it->first, it->second).c_str());
@ -122,11 +126,9 @@ struct curlFileTransfer : public FileTransfer
~TransferItem() ~TransferItem()
{ {
if (req) {
if (active) if (active)
curl_multi_remove_handle(fileTransfer.curlm, req); curl_multi_remove_handle(fileTransfer.curlm, req);
curl_easy_cleanup(req); curl_easy_cleanup(req);
}
if (requestHeaders) curl_slist_free_all(requestHeaders); if (requestHeaders) curl_slist_free_all(requestHeaders);
try { try {
if (!done) if (!done)
@ -268,8 +270,6 @@ struct curlFileTransfer : public FileTransfer
void init() void init()
{ {
if (!req) req = curl_easy_init();
curl_easy_reset(req); curl_easy_reset(req);
if (verbosity >= lvlVomit) { if (verbosity >= lvlVomit) {