curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-13 23:52:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

tool_getparam: replace malloc + copy by dynbuf for --data

Browse Source
This commit is contained in:
Daniel Stenberg 2024-01-08 17:00:05 +01:00
parent f37840a46e
commit 1dba44b2f1
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
4 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/tool_getparam.c
View File

@ -860,34 +860,24 @@ static ParameterError set_data(char subletter,
config->jsoned = TRUE;
if(config->postfields) {
/* we already have a string, we append this one with a separating
&-letter */
char *oldpost = config->postfields;
curl_off_t oldlen = config->postfieldsize;
curl_off_t newlen = oldlen + curlx_uztoso(size) + 2;
config->postfields = malloc((size_t)newlen);
if(!config->postfields) {
Curl_safefree(oldpost);
Curl_safefree(postdata);
/* we already have a string, append this one - perhaps with a separator */
struct curlx_dynbuf out;
curlx_dyn_init(&out, MAX_FILE2MEMORY);
if(curlx_dyn_addn(&out, config->postfields,
(size_t)config->postfieldsize))
err = PARAM_NO_MEM;
goto done;
}
memcpy(config->postfields, oldpost, (size_t)oldlen);
if(subletter != 'f') {
/* skip this treatment for --json */
/* use byte value 0x26 for '&' to accommodate non-ASCII platforms */
config->postfields[oldlen] = '\x26';
memcpy(&config->postfields[oldlen + 1], postdata, size);
config->postfields[oldlen + 1 + size] = '\0';
config->postfieldsize += size + 1;
}
else {
memcpy(&config->postfields[oldlen], postdata, size);
config->postfields[oldlen + size] = '\0';
config->postfieldsize += size;
}
Curl_safefree(oldpost);
/* skip the separator append for --json */
if(!err && (subletter != 'f') && curlx_dyn_addn(&out, "&", 1))
err = PARAM_NO_MEM;
if(!err && curlx_dyn_addn(&out, postdata, size))
err = PARAM_NO_MEM;
config->postfieldsize = curlx_dyn_len(&out);
free(config->postfields);
Curl_safefree(postdata);
config->postfields = curlx_dyn_ptr(&out);
}
else {
config->postfields = postdata;

1
src/tool_operate.c
View File

@ -372,7 +372,6 @@ void single_transfer_cleanup(struct OperationConfig *config)
state->urls = NULL;
}
Curl_safefree(state->outfiles);
Curl_safefree(state->httpgetfields);
Curl_safefree(state->uploadfile);
if(state->inglob) {
/* Free list of globbed upload files */

2
src/tool_paramhlp.c
View File

@ -88,8 +88,6 @@ ParameterError file2string(char **bufp, FILE *file)
return PARAM_OK;
}
#define MAX_FILE2MEMORY (1024*1024*1024) /* big enough ? */
ParameterError file2memory(char **bufp, size_t *size, FILE *file)
{
if(file) {

2
src/tool_paramhlp.h
View File

@ -30,6 +30,8 @@ struct getout *new_getout(struct OperationConfig *config);
ParameterError file2string(char **bufp, FILE *file);
#define MAX_FILE2MEMORY (1024*1024*1024) /* big enough ? */
ParameterError file2memory(char **bufp, size_t *size, FILE *file);
ParameterError str2num(long *val, const char *str);