Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
ae5c7e25
Commit
ae5c7e25
authored
Feb 27, 2018
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a very strange corner-case of vcl syntax level handling.
Spotted by: simon
parent
a5b03294
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
14 deletions
+15
-14
vcc_compile.h
lib/libvcc/vcc_compile.h
+0
-1
vcc_parse.c
lib/libvcc/vcc_parse.c
+15
-13
No files found.
lib/libvcc/vcc_compile.h
View file @
ae5c7e25
...
...
@@ -76,7 +76,6 @@ struct symbol;
struct
source
{
VTAILQ_ENTRY
(
source
)
list
;
int
syntax
;
char
*
name
;
const
char
*
b
;
const
char
*
e
;
...
...
lib/libvcc/vcc_parse.c
View file @
ae5c7e25
...
...
@@ -276,6 +276,7 @@ static void
vcc_ParseVcl
(
struct
vcc
*
tl
)
{
struct
token
*
tok0
,
*
tok1
,
*
tok2
;
int
syntax
;
assert
(
vcc_IdIs
(
tl
->
t
,
"vcl"
));
tok0
=
tl
->
t
;
...
...
@@ -283,14 +284,14 @@ vcc_ParseVcl(struct vcc *tl)
tok1
=
tl
->
t
;
Expect
(
tl
,
CNUM
);
tok1
->
src
->
syntax
=
(
*
tl
->
t
->
b
-
'0'
)
*
10
;
syntax
=
(
*
tl
->
t
->
b
-
'0'
)
*
10
;
vcc_NextToken
(
tl
);
Expect
(
tl
,
'.'
);
vcc_NextToken
(
tl
);
Expect
(
tl
,
CNUM
);
tok2
=
tl
->
t
;
tok1
->
src
->
syntax
+=
(
*
tl
->
t
->
b
-
'0'
);
syntax
+=
(
*
tl
->
t
->
b
-
'0'
);
vcc_NextToken
(
tl
);
if
(
tok1
->
e
-
tok1
->
b
!=
1
||
tok2
->
e
-
tok2
->
b
!=
1
)
{
...
...
@@ -300,6 +301,13 @@ vcc_ParseVcl(struct vcc *tl)
ERRCHK
(
tl
);
}
if
(
syntax
<
VCL_LOW
||
syntax
>
VCL_HIGH
)
{
VSB_printf
(
tl
->
sb
,
"VCL version %.1f not supported.
\n
"
,
.
1
*
syntax
);
vcc_ErrWhere2
(
tl
,
tok0
,
tl
->
t
);
ERRCHK
(
tl
);
}
if
(
tl
->
t
->
tok
!=
';'
)
{
/* Special handling, because next token might be 'vcl'
* in the built-in VCL, and that would give a very
...
...
@@ -311,11 +319,13 @@ vcc_ParseVcl(struct vcc *tl)
ERRCHK
(
tl
);
}
vcc_NextToken
(
tl
);
if
(
tl
->
syntax
!=
0
.
0
&&
tok1
->
src
->
syntax
>
tl
->
syntax
)
{
if
(
tl
->
syntax
==
0
)
tl
->
syntax
=
syntax
;
if
(
syntax
>
tl
->
syntax
)
{
VSB_printf
(
tl
->
sb
,
"VCL version %.1f higher than"
" the top level version %.1f
\n
"
,
.
1
*
tok1
->
src
->
syntax
,
.
1
*
tl
->
syntax
);
.
1
*
syntax
,
.
1
*
tl
->
syntax
);
vcc_ErrWhere2
(
tl
,
tok0
,
tl
->
t
);
ERRCHK
(
tl
);
}
...
...
@@ -352,7 +362,6 @@ void
vcc_Parse
(
struct
vcc
*
tl
)
{
struct
toplev
*
tp
;
struct
token
*
tok
;
AZ
(
tl
->
indent
);
if
(
tl
->
t
->
tok
!=
ID
||
!
vcc_IdIs
(
tl
->
t
,
"vcl"
))
{
...
...
@@ -365,16 +374,9 @@ vcc_Parse(struct vcc *tl)
vcc_ErrWhere
(
tl
,
tl
->
t
);
ERRCHK
(
tl
);
}
tok
=
tl
->
t
;
vcc_ParseVcl
(
tl
);
if
(
tok
->
src
->
syntax
<
VCL_LOW
||
tok
->
src
->
syntax
>
VCL_HIGH
)
{
VSB_printf
(
tl
->
sb
,
"VCL version %.1f not supported.
\n
"
,
.
1
*
tok
->
src
->
syntax
);
vcc_ErrWhere2
(
tl
,
tok
,
tl
->
t
);
ERRCHK
(
tl
);
}
tl
->
syntax
=
tl
->
t
->
src
->
syntax
;
ERRCHK
(
tl
);
AN
(
tl
->
syntax
);
while
(
tl
->
t
->
tok
!=
EOI
)
{
ERRCHK
(
tl
);
switch
(
tl
->
t
->
tok
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment