From: Joel Depooter <joel.depooter@safe.com>
Date: Wed, 26 Oct 2022 00:12:30 +0000 (-0700)
Subject: sendf: remove unnecessary if condition
X-Git-Tag: curl-7_87_0~232
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df77eff27871fc755f04d5d7dc1ba2b2133fcd04;p=thirdparty%2Fcurl.git

sendf: remove unnecessary if condition

At this point, the psnd->buffer will always exist. We have already
allocated a new buffer if one did not previously exist, and returned
from the function if the allocation failed.

Closes #9801
---

diff --git a/lib/sendf.c b/lib/sendf.c
index d26b7e7cd7..ad978d10ce 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -151,6 +151,8 @@ static CURLcode pre_receive_plain(struct Curl_easy *data,
   const curl_socket_t sockfd = conn->sock[num];
   struct postponed_data * const psnd = &(conn->postponed[num]);
   size_t bytestorecv = psnd->allocated_size - psnd->recv_size;
+  ssize_t recvedbytes;
+
   /* WinSock will destroy unread received data if send() is
      failed.
      To avoid lossage of received data, recv() must be
@@ -176,16 +178,12 @@ static CURLcode pre_receive_plain(struct Curl_easy *data,
 #endif /* DEBUGBUILD */
         bytestorecv = psnd->allocated_size;
       }
-      if(psnd->buffer) {
-        ssize_t recvedbytes;
-        DEBUGASSERT(psnd->bindsock == sockfd);
-        recvedbytes = sread(sockfd, psnd->buffer + psnd->recv_size,
-                            bytestorecv);
-        if(recvedbytes > 0)
-          psnd->recv_size += recvedbytes;
-      }
-      else
-        psnd->allocated_size = 0;
+
+      DEBUGASSERT(psnd->bindsock == sockfd);
+      recvedbytes = sread(sockfd, psnd->buffer + psnd->recv_size,
+                          bytestorecv);
+      if(recvedbytes > 0)
+        psnd->recv_size += recvedbytes;
     }
   }
   return CURLE_OK;