holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Catch multiple semicolons on a line.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-09-26 07:42:44 -07:00
parent 9a4dfc4394
commit 4c7f1a03a0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall/Perl/Shorewall/Config.pm
View File

@ -1341,8 +1341,9 @@ sub supplied( $ ) {
sub split_line( $$$$ ) { sub split_line( $$$$ ) {
my ( $mincolumns, $maxcolumns, $description, $columnsref ) = @_; my ( $mincolumns, $maxcolumns, $description, $columnsref ) = @_;
my ( $columns, $pairs ) = split( ';', $currentline ); my ( $columns, $pairs, $rest ) = split( ';', $currentline );
fatal_error "Only one semicolon (';') allowed on a line" if defined $rest;
fatal_error "Shorewall Configuration file entries may not contain single quotes, double quotes, single back quotes or backslashes" if $columns =~ /["'`\\]/; fatal_error "Shorewall Configuration file entries may not contain single quotes, double quotes, single back quotes or backslashes" if $columns =~ /["'`\\]/;
fatal_error "Non-ASCII gunk in file" if $columns =~ /[^\s[:print:]]/; fatal_error "Non-ASCII gunk in file" if $columns =~ /[^\s[:print:]]/;
@ -1378,8 +1379,9 @@ sub split_line( $$$$ ) {
sub split_line1( $$$$;$ ) { sub split_line1( $$$$;$ ) {
my ( $mincolumns, $maxcolumns, $description, $columnsref, $nopad) = @_; my ( $mincolumns, $maxcolumns, $description, $columnsref, $nopad) = @_;
my ( $columns, $pairs ) = split( ';', $currentline ); my ( $columns, $pairs, $rest ) = split( ';', $currentline );
fatal_error "Only one semicolon (';') allowed on a line" if defined $rest;
fatal_error "Shorewall Configuration file entries may not contain double quotes, single back quotes or backslashes" if $columns =~ /["`\\]/; fatal_error "Shorewall Configuration file entries may not contain double quotes, single back quotes or backslashes" if $columns =~ /["`\\]/;
fatal_error "Non-ASCII gunk in file" if $columns =~ /[^\s[:print:]]/; fatal_error "Non-ASCII gunk in file" if $columns =~ /[^\s[:print:]]/;