From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 13 Aug 2024 07:12:18 +0000 (+0200)
Subject: tool_paramhlp: bump maximum post data size in memory to 16GB
X-Git-Tag: curl-8_10_0~272
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad6320b8a577f2c5401d85976b168ab873ff3fdc;p=thirdparty%2Fcurl.git

tool_paramhlp: bump maximum post data size in memory to 16GB

- stick to 2GB for 32bit systems.

Reported-by: Tim Yuer
Fixes #14521
Closes #14523
---

diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c
index 82c0041d4a..84b150cc42 100644
--- a/src/tool_paramhlp.c
+++ b/src/tool_paramhlp.c
@@ -90,12 +90,11 @@ static size_t memcrlf(char *orig,
   return total; /* no delimiter found */
 }
 
-#define MAX_FILE2STRING (256*1024*1024) /* big enough ? */
+#define MAX_FILE2STRING MAX_FILE2MEMORY
 
 ParameterError file2string(char **bufp, FILE *file)
 {
   struct curlx_dynbuf dyn;
-  DEBUGASSERT(MAX_FILE2STRING < INT_MAX); /* needs to fit in an int later */
   curlx_dyn_init(&dyn, MAX_FILE2STRING);
   if(file) {
     do {
@@ -133,7 +132,6 @@ ParameterError file2memory(char **bufp, size_t *size, FILE *file)
     size_t nread;
     struct curlx_dynbuf dyn;
     /* The size needs to fit in an int later */
-    DEBUGASSERT(MAX_FILE2MEMORY < INT_MAX);
     curlx_dyn_init(&dyn, MAX_FILE2MEMORY);
     do {
       char buffer[4096];
diff --git a/src/tool_paramhlp.h b/src/tool_paramhlp.h
index 96c49ac59e..bd703afc8c 100644
--- a/src/tool_paramhlp.h
+++ b/src/tool_paramhlp.h
@@ -30,7 +30,11 @@ struct getout *new_getout(struct OperationConfig *config);
 
 ParameterError file2string(char **bufp, FILE *file);
 
-#define MAX_FILE2MEMORY (1024*1024*1024) /* big enough ? */
+#if SIZEOF_SIZE_T > 4
+#define MAX_FILE2MEMORY (16LL*1024*1024*1024)
+#else
+#define MAX_FILE2MEMORY (INT_MAX)
+#endif
 
 ParameterError file2memory(char **bufp, size_t *size, FILE *file);