romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-05-18 19:16:21 +03:00
Code Issues Projects Releases Packages Wiki Activity

tool_cb_wrt: use dynbuf instead of "manual" malloc

Browse source 
When creating new file names for no-clobber

Closes #18182
This commit is contained in:
Daniel Stenberg 2025-08-05 13:43:49 +02:00
parent fe4ade53b7
commit 2978d33089
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 8 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/tool_cb_wrt.c
View file

@ -68,35 +68,24 @@ bool tool_create_output_file(struct OutStruct *outs,
} while(fd == -1 && errno == EINTR);
if(config->file_clobber_mode == CLOBBER_NEVER && fd == -1) {
int next_num = 1;
size_t len = strlen(fname);
size_t newlen = len + 13; /* nul + 1-11 digits + dot */
char *newname;
/* Guard against wraparound in new filename */
if(newlen < len) {
errorf(global, "overflow in filename generation");
return FALSE;
}
newname = malloc(newlen);
if(!newname) {
errorf(global, "out of memory");
return FALSE;
}
memcpy(newname, fname, len);
newname[len] = '.';
struct dynbuf fbuffer;
curlx_dyn_init(&fbuffer, 1025);
/* !checksrc! disable ERRNOVAR 1 */
while(fd == -1 && /* have not successfully opened a file */
(errno == EEXIST || errno == EISDIR) &&
/* because we keep having files that already exist */
next_num < 100 /* and we have not reached the retry limit */ ) {
msnprintf(newname + len + 1, 12, "%d", next_num);
curlx_dyn_reset(&fbuffer);
if(curlx_dyn_addf(&fbuffer, "%s.%d", fname, next_num))
return FALSE;
next_num++;
do {
fd = open(newname, O_CREAT | O_WRONLY | O_EXCL | CURL_O_BINARY,
OPENMODE);
fd = open(curlx_dyn_ptr(&fbuffer),
O_CREAT | O_WRONLY | O_EXCL | CURL_O_BINARY, OPENMODE);
/* Keep retrying in the hope that it is not interrupted sometime */
} while(fd == -1 && errno == EINTR);
}
outs->filename = newname; /* remember the new one */
outs->filename = curlx_dyn_ptr(&fbuffer); /* remember the new one */
outs->alloc_filename = TRUE;
}
/* An else statement to not overwrite existing files and not retry with