romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 11:13:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

Curl_pgrsDone: return int and acknowledge return code

Browse source 
Since Curl_pgrsDone() itself calls Curl_pgrsUpdate() which may return an
abort instruction or similar we need to return that info back and
subsequently properly handle return codes from Curl_pgrsDone() where
used.

(Spotted by a Coverity scan)
This commit is contained in:
Daniel Stenberg 2012-06-10 23:39:04 +02:00
parent 72c7c1d64e
commit 6cd084a3b5
5 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/url.c
View file

@ -5379,7 +5379,8 @@ CURLcode Curl_done(struct connectdata **connp,
else
result = CURLE_OK;
Curl_pgrsDone(conn); /* done with the operation */
if(Curl_pgrsDone(conn) && !result)
result = CURLE_ABORTED_BY_CALLBACK;
/* if the transfer was completed in a paused state there can be buffered
data left to write and then kill */