From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 15 Jul 2020 12:04:32 +0000 (+0200)
Subject: file2memory: use a define instead of -1 unsigned value
X-Git-Tag: curl-7_72_0~102
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b331a5fa09e15a01b2ee9ce21fe7e46fcc80dcd3;p=thirdparty%2Fcurl.git

file2memory: use a define instead of -1 unsigned value

... to use the maximum value for 'size_t' when detecting integer overflow.
Changed the limit to max/4 as already that seems unreasonably large.

Codacy didn't like the previous approach.

Closes #5683
---

diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c
index c375bcc824..e57daa2e12 100644
--- a/src/tool_paramhlp.c
+++ b/src/tool_paramhlp.c
@@ -115,8 +115,8 @@ ParameterError file2memory(char **bufp, size_t *size, FILE *file)
     size_t alloc = 512;
     do {
       if(!buffer || (alloc == nused)) {
-        /* size_t overflow detection for huge files */
-        if(alloc + 1 > ((size_t)-1)/2) {
+        /* size_t overflow detection and avoiding huge files */
+        if(alloc >= (SIZE_T_MAX/4)) {
           Curl_safefree(buffer);
           return PARAM_NO_MEM;
         }