From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 29 Oct 2024 07:01:47 +0000 (+0100)
Subject: setopt_cptr: make overflow check only done when needed
X-Git-Tag: curl-8_11_0~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbc39a88d7cf59218708352933f77e884469bf7d;p=thirdparty%2Fcurl.git

setopt_cptr: make overflow check only done when needed

An overflow check for if the value of a curl_off_t is larger than a
size_t can hold, is only necessary if the two types are actually
differently sized, now checked by the preprocessor. To avoid
"Unreachable Conditional".

Closes #15439
---

diff --git a/lib/setopt.c b/lib/setopt.c
index 84e605d5ef..48642602a7 100644
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -1730,14 +1730,15 @@ static CURLcode setopt_cptr(struct Curl_easy *data, CURLoption option,
     if(!ptr || data->set.postfieldsize == -1)
       result = Curl_setstropt(&data->set.str[STRING_COPYPOSTFIELDS], ptr);
     else {
+      if(data->set.postfieldsize < 0)
+        return CURLE_BAD_FUNCTION_ARGUMENT;
+#if SIZEOF_CURL_OFF_T > SIZEOF_SIZE_T
       /*
        *  Check that requested length does not overflow the size_t type.
        */
-
-      if((data->set.postfieldsize < 0) ||
-         ((sizeof(curl_off_t) != sizeof(size_t)) &&
-          (data->set.postfieldsize > (curl_off_t)((size_t)-1))))
+      else if(data->set.postfieldsize > SIZE_T_MAX)
         return CURLE_OUT_OF_MEMORY;
+#endif
       else {
         /* Allocate even when size == 0. This satisfies the need of possible
            later address compare to detect the COPYPOSTFIELDS mode, and to