mirror of
https://gitlab.com/shorewall/code.git
synced 2024-12-18 12:20:42 +01:00
Disallow ?FORMAT when $max_format == 1
Signed-off-by: Tom Eastep <teastep@shorewall.net> Conflicts: Shorewall/Perl/Shorewall/Config.pm
This commit is contained in:
parent
100e03cf93
commit
bfeea76cf2
@ -2250,6 +2250,7 @@ sub process_compiler_directive( $$$$ ) {
|
|||||||
|
|
||||||
FORMAT => sub() {
|
FORMAT => sub() {
|
||||||
unless ( $omitting ) {
|
unless ( $omitting ) {
|
||||||
|
directive_error( "?FORMAT is not allowed in this file", $filename, $linenumber ) unless $max_format > 1;
|
||||||
directive_error( "Missing format", $filename, $linenumber ) unless supplied $expression;
|
directive_error( "Missing format", $filename, $linenumber ) unless supplied $expression;
|
||||||
directive_error( "Invalid format ($expression)", $filename, $linenumber ) unless $expression =~ /^\d+$/;
|
directive_error( "Invalid format ($expression)", $filename, $linenumber ) unless $expression =~ /^\d+$/;
|
||||||
directive_error( "Format must be between 1 and $max_format", $filename, $linenumber ) unless $expression && $expression <= $max_format;
|
directive_error( "Format must be between 1 and $max_format", $filename, $linenumber ) unless $expression && $expression <= $max_format;
|
||||||
|
Loading…
Reference in New Issue
Block a user