mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-01 06:45:10 +00:00
Code Issues Releases Wiki Activity

fill_args was adding an extra leading space

Browse Source
This commit is contained in:
Todd C. Miller
1996-07-23 05:10:35 +00:00
parent 945d9795ef
commit 4dba5f4fcc
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
parse.lex
View File

@@ -300,23 +300,38 @@ static void fill_args(s, len, addspace)
int len; int len;
int addspace; int addspace;
{ {
int new_len = arg_len + len + addspace; int new_len;
char *p; char *p;
/* /*
* If we don't have enough space realloc() some more * If first arg, malloc() some room, else if we don't
* have enough space realloc() some more.
*/ */
if (new_len >= arg_size) { if (yylval.command.args == NULL) {
/* Allocate more space than we need for subsequent args */ addspace = 0;
new_len = len;
while (new_len >= (arg_size += COMMANDARGINC)) while (new_len >= (arg_size += COMMANDARGINC))
; ;
yylval.command.args = (char *) realloc(yylval.command.args, arg_size); yylval.command.args = (char *) malloc(arg_size);
if (yylval.command.args == NULL) if (yylval.command.args == NULL)
yyerror("unable to allocate memory"); yyerror("unable to allocate memory");
} else {
new_len = arg_len + len + addspace;
if (new_len >= arg_size) {
/* Allocate more space than we need for subsequent args */
while (new_len >= (arg_size += COMMANDARGINC))
;
yylval.command.args = (char *) realloc(yylval.command.args, arg_size);
if (yylval.command.args == NULL)
yyerror("unable to allocate memory");
}
} }
/* Efficiently append the arg (with a leading space) */ /* Efficiently append the arg (with a leading space if needed). */
p = yylval.command.args + arg_len; p = yylval.command.args + arg_len;
if (addspace) if (addspace)
*p++ = ' '; *p++ = ' ';