mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-30 13:58:05 +00:00
Code Issues Releases Wiki Activity

Properly deal with Defaults double-quoted strings that span multiple

Browse Source 
lines using the line continuation char.  Previously, the entire thing,
including the continuation char, newline, and spaces was stored as-is.
This commit is contained in:
Todd C. Miller
2007-08-20 23:19:44 +00:00
parent fa6536920b
commit 9cf8213c26
2 changed files with 2909 additions and 2787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5621
toke.c
View File

File diff suppressed because it is too large Load Diff

75
toke.l
View File

@@ -65,12 +65,15 @@ static int sawspace = 0;
static int arg_len = 0; static int arg_len = 0;
static int arg_size = 0; static int arg_size = 0;
static int fill __P((char *, int)); static int append __P((char *, int));
static int _fill __P((char *, int, int));
static int fill_cmnd __P((char *, int)); static int fill_cmnd __P((char *, int));
static int fill_args __P((char *, int, int)); static int fill_args __P((char *, int, int));
static int switch_buffer __P((char *)); static int switch_buffer __P((char *));
extern void yyerror __P((const char *)); extern void yyerror __P((const char *));
#define fill(a, b) _fill(a, b, 0)
#define push_include(_p) (switch_buffer((_p))) #define push_include(_p) (switch_buffer((_p)))
#define pop_include() (switch_buffer(NULL)) #define pop_include() (switch_buffer(NULL))
@@ -92,7 +95,7 @@ IPV6ADDR \:\:|({HEXDIGIT}\:){7}{HEXDIGIT}|({HEXDIGIT}\:){5}{HEXDIGIT}\:{DOTTEDQ
HOSTNAME [[:alnum:]_-]+ HOSTNAME [[:alnum:]_-]+
WORD ([^#>!=:,\(\) \t\n\\]|\\[^\n])+ WORD ([^#>!=:,\(\) \t\n\\]|\\[^\n])+
PATH \/(\\[\,:= \t#]|[^\,:=\\ \t\n#])+ PATH \/(\\[\,:= \t#]|[^\,:=\\ \t\n#])+
ENVAR ([^#!=, \t\n\\]|\\[^\n])([^#=, \t\n\\]|\\[^\n])* ENVAR ([^#!=, \t\n\\\"]|\\[^\n])([^#=, \t\n\\\"]|\\[^\n])*
DEFVAR [a-z_]+ DEFVAR [a-z_]+
%option nounput %option nounput
@@ -104,6 +107,7 @@ DEFVAR [a-z_]+
%x GOTCMND %x GOTCMND
%x STARTDEFS %x STARTDEFS
%x INDEFS %x INDEFS
%x INSTR
%% %%
<GOTDEFS>[[:blank:]]+ BEGIN STARTDEFS; <GOTDEFS>[[:blank:]]+ BEGIN STARTDEFS;
@@ -138,11 +142,10 @@ DEFVAR [a-z_]+
return('-'); return('-');
} /* return '-' */ } /* return '-' */
\"([^\"]|\\\")+\" { \" {
LEXTRACE("WORD(1) "); LEXTRACE("BEGINSTR ");
if (!fill(yytext + 1, yyleng - 2)) yylval.string = NULL;
yyterminate(); BEGIN INSTR;
return(WORD);
} }
{ENVAR} { {ENVAR} {
@@ -153,6 +156,30 @@ DEFVAR [a-z_]+
} }
} }
<INSTR>{
\\\n[[:blank:]]* {
/* Line continuation char followed by newline. */
++sudolineno;
LEXTRACE("\n");
}
\" {
LEXTRACE("ENDSTR ");
BEGIN INDEFS;
return(WORD);
}
([^\"\n]|\\\")+ {
LEXTRACE("STRBODY ");
/* Push back line continuation char if present */
if (yyleng > 2 && yytext[yyleng - 1] == '\\' &&
isspace((unsigned char)yytext[yyleng - 2]))
yyless(yyleng - 1);
if (!append(yytext, yyleng))
yyterminate();
}
}
<GOTCMND>{ <GOTCMND>{
\\[\*\?\[\]\!] { \\[\*\?\[\]\!] {
/* quoted fnmatch glob char, pass verbatim */ /* quoted fnmatch glob char, pass verbatim */
@@ -459,29 +486,45 @@ sudoedit {
%% %%
static int static int
fill(s, len) _fill(src, len, olen)
char *s; char *src;
int len; int len, olen;
{ {
int i, j; int i, j;
char *dst;
yylval.string = (char *) malloc(len + 1); dst = olen ? realloc(yylval.string, olen + len + 1) : malloc(len + 1);
if (yylval.string == NULL) { if (dst == NULL) {
yyerror("unable to allocate memory"); yyerror("unable to allocate memory");
return(FALSE); return(FALSE);
} }
yylval.string = dst;
/* Copy the string and collapse any escaped characters. */ /* Copy the string and collapse any escaped characters. */
dst += olen;
for (i = 0, j = 0; i < len; i++, j++) { for (i = 0, j = 0; i < len; i++, j++) {
if (s[i] == '\\' && i != len - 1) if (src[i] == '\\' && i != len - 1)
yylval.string[j] = s[++i]; dst[j] = src[++i];
else else
yylval.string[j] = s[i]; dst[j] = src[i];
} }
yylval.string[j] = '\0'; dst[j] = '\0';
return(TRUE); return(TRUE);
} }
static int
append(src, len)
char *src;
int len;
{
int olen = 0;
if (yylval.string != NULL)
olen = strlen(yylval.string);
return(_fill(src, len, olen));
}
static int static int
fill_cmnd(s, len) fill_cmnd(s, len)
char *s; char *s;