generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

main.c: de-obfuscate a couple for-loop exit conditions

Browse Source
This commit is contained in:
Yang Tse 2011-09-16 00:36:21 +02:00
parent e6697ef59c
commit e533f59025
1 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/main.c
View File

@ -4900,15 +4900,26 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])
/* Here's the loop for uploading multiple files within the same /* Here's the loop for uploading multiple files within the same
single globbed string. If no upload, we enter the loop once anyway. */ single globbed string. If no upload, we enter the loop once anyway. */
for(up = 0; for(up = 0 ;; up++) {
(!up && !infiles) ||
((uploadfile = inglob?
glob_next_url(inglob):
(!up?strdup(infiles):NULL)) != NULL);
up++) {
int separator = 0;
long retry_numretries; long retry_numretries;
uploadfilesize=-1; int separator;
if(!up && !infiles)
Curl_nop_stmt;
else {
if(inglob)
uploadfile = glob_next_url(inglob);
else if(!up)
uploadfile = strdup(infiles);
else
uploadfile = NULL;
if(!uploadfile)
break;
}
separator = 0;
uploadfilesize = -1;
if(!config->globoff) { if(!config->globoff) {
/* Unless explicitly shut off, we expand '{...}' and '[...]' /* Unless explicitly shut off, we expand '{...}' and '[...]'
@ -4926,20 +4937,22 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])
separator= ((!outfiles || curlx_strequal(outfiles, "-")) && urlnum > 1); separator= ((!outfiles || curlx_strequal(outfiles, "-")) && urlnum > 1);
/* Here's looping around each globbed URL */ /* Here's looping around each globbed URL */
for(i = 0; for(i = 0 ;; i++) {
((url = urls?glob_next_url(urls):(i?NULL:strdup(url))) != NULL);
i++) {
/* NOTE: In the condition expression in the for() statement above, the
'url' variable is only ever strdup()ed if(i == 0) and thus never
when this loops later on. Further down in this function we call
free(url) and then the code loops. Static code parsers may thus get
tricked into believing that we have a potential access-after-free
here. I can however not spot any such case. */
int infd = STDIN_FILENO; int infd = STDIN_FILENO;
bool infdopen; bool infdopen;
char *outfile; char *outfile;
struct timeval retrystart; struct timeval retrystart;
if(urls)
url = glob_next_url(urls);
else if(!i)
url = strdup(url);
else
url = NULL;
if(!url)
break;
outfile = outfiles?strdup(outfiles):NULL; outfile = outfiles?strdup(outfiles):NULL;
if((urlnode->flags&GETOUT_USEREMOTE) || if((urlnode->flags&GETOUT_USEREMOTE) ||