generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Curl_socket_check: fix return code for timeout

Browse Source 
We found a problem with ftp transfer using libcurl (7.23 and 7.25)
inside an application which is receiving unix signals (SIGUSR1,
SIGUSR2...) almost continuously. (Linux 2.4, PowerPC, HAVE_POLL_FINE
defined).

Curl_socket_check() uses poll() to wait for the socket, and retries it
when a signal is received (EINTR). However, if a signal is received and
it also happens that the timeout has been reached, Curl_socket_check()
returns -1 instead of 0 (indicating an error instead of a timeout).

In our case, the result is an aborted connection even before the ftp
banner is received from the server, and a return value of
CURLE_OUT_OF_MEMORY from curl_easy_perform() (Curl_pp_multi_statemach(),
in pingpong.c, actually returns OOM if Curl_socket_check() fails :-)
Funny to debug on a system on which OOM is a possible cause).

Bug: http://curl.haxx.se/mail/lib-2012-07/0122.html
This commit is contained in:
Maxime Larocque 2012-08-07 23:24:13 +02:00 committed by Daniel Stenberg
parent 77f72aa6c3
commit b61e8b81f5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/select.c
View File

@ -221,9 +221,11 @@ int Curl_socket_check(curl_socket_t readfd0, /* two sockets to read from */
break; break;
if(timeout_ms > 0) { if(timeout_ms > 0) {
pending_ms = (int)(timeout_ms - elapsed_ms); pending_ms = (int)(timeout_ms - elapsed_ms);
if(pending_ms <= 0) if(pending_ms <= 0) {
r = 0; /* Simulate a "call timed out" case */
break; break;
} }
}
} while(r == -1); } while(r == -1);
if(r < 0) if(r < 0)