[gnurl] 159/264: lib: fix conversion warnings for SOCKET_WRITABLE/READABLE

[gnunet]

This is an automated email from the git hooks/post-receive script.

nikita pushed a commit to branch master
in repository gnurl.

commit 53f407082746e7e57534595957616b8d56905ad5
Author: Jay Satiro <address@hidden>
AuthorDate: Tue Apr 7 17:18:05 2020 -0400

    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
---
 lib/socks.c         | 4 +++-
 lib/vtls/schannel.c | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/socks.c b/lib/socks.c
index 37099130e..5dd83631c 100644
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -68,7 +68,9 @@ int Curl_blockread_all(struct connectdata *conn, /* 
connection data */
       result = CURLE_OPERATION_TIMEDOUT;
       break;
     }
-    if(SOCKET_READABLE(sockfd, timeleft) <= 0) {
+    if(timeleft > TIME_T_MAX)
+      timeleft = TIME_T_MAX;
+    if(SOCKET_READABLE(sockfd, (time_t)timeleft) <= 0) {
       result = ~CURLE_OK;
       break;
     }
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);

-- 
To stop receiving notification emails like this one, please contact
address@hidden.