diff options
| author | Jay Satiro <raysatiro@yahoo.com> | 2020-04-07 17:18:05 -0400 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2020-04-11 02:52:25 -0400 |
| commit | 53f407082746e7e57534595957616b8d56905ad5 (patch) | |
| tree | 8860303635fdff2c9ae4fc24f498e585eb7dbe06 /lib/vtls/schannel.c | |
| parent | 17c18fbc3015b5dc0580d16a4ff5bcf2fd88b449 (diff) | |
lib: fix conversion warnings for SOCKET_WRITABLE/READABLE
- If loss of data may occur converting a timediff_t to time_t and
the time value is > TIME_T_MAX then treat it as TIME_T_MAX.
This is a follow-up to 8843678 which removed the (time_t) typecast
from the macros so that conversion warnings could be identified.
Closes https://github.com/curl/curl/pull/5199
Diffstat (limited to 'lib/vtls/schannel.c')
| -rw-r--r-- | lib/vtls/schannel.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c index 8bf598c07..cb70d5309 100644 --- a/lib/vtls/schannel.c +++ b/lib/vtls/schannel.c @@ -1645,8 +1645,9 @@ schannel_send(struct connectdata *conn, int sockindex, written = -1; break; } - - what = SOCKET_WRITABLE(conn->sock[sockindex], timeleft); + if(timeleft > TIME_T_MAX) + timeleft = TIME_T_MAX; + what = SOCKET_WRITABLE(conn->sock[sockindex], (time_t)timeleft); if(what < 0) { /* fatal error */ failf(conn->data, "select/poll on SSL socket, errno: %d", SOCKERRNO); |