jaiden/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

filetransfer: correctly abort empty transfers

Browse source 
returning 0 from the callback for errors signals successful transfer if
the source returned no data even though the exception we've just caught
clearly disagrees. while this is not all that important (since the only
viable cause of such errors will be dataCallback, and the sole instance
of it being used already takes care of exceptions) we can just do this.

Change-Id: I2bb150eff447121d82e8e3aa4e00057c40523ac6
This commit is contained in:
eldritch horrors 2024-05-06 16:46:11 +02:00
parent 121edecf65
commit f75d0752ce
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libstore/filetransfer.cc
View file

@ -149,6 +149,8 @@ struct curlFileTransfer : public FileTransfer
size_t writeCallback(void * contents, size_t size, size_t nmemb) size_t writeCallback(void * contents, size_t size, size_t nmemb)
{ {
const size_t realSize = size * nmemb;
try { try {
if (!headersProcessed) { if (!headersProcessed) {
if (auto h = getHeader("content-encoding")) { if (auto h = getHeader("content-encoding")) {
@ -161,7 +163,6 @@ struct curlFileTransfer : public FileTransfer
headersProcessed = true; headersProcessed = true;
} }
size_t realSize = size * nmemb;
result.bodySize += realSize; result.bodySize += realSize;
if (successfulStatuses.count(getHTTPStatus()) && this->dataCallback) { if (successfulStatuses.count(getHTTPStatus()) && this->dataCallback) {
@ -174,7 +175,7 @@ struct curlFileTransfer : public FileTransfer
return realSize; return realSize;
} catch (...) { } catch (...) {
writeException = std::current_exception(); writeException = std::current_exception();
return 0; return CURL_WRITEFUNC_ERROR;
} }
} }