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

Keep parentheses balanced when splitting a line.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-11-30 14:13:42 -08:00
parent 88467a1737
commit bf44e514e3
1 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1982,6 +1982,57 @@ sub split_list3( $$ ) {
@list2; @list2;
} }
sub split_list4( $ ) {
my ($list) = @_;
return split ' ', $list unless $list =~ /\(/;
my @list1 = split ' ', $list;
my @list2;
my $element = '';
my $opencount = 0;
for ( @list1 ) {
my $count;
if ( ( $count = tr/(/(/ ) > 0 ) {
$opencount += $count;
if ( $element eq '' ) {
$element = $_;
} else {
$element = join( ',', $element, $_ );
}
if ( ( $count = tr/)/)/ ) > 0 ) {
if ( ! ( $opencount -= $count ) ) {
push @list2 , $element;
$element = '';
} else {
fatal_error "Mismatched parentheses ($list)" if $opencount < 0;
}
}
} elsif ( ( $count = tr/)/)/ ) > 0 ) {
$element = join (',', $element, $_ );
if ( ! ( $opencount -= $count ) ) {
push @list2 , $element;
$element = '';
} else {
fatal_error "Mismatched parentheses ($list)" if $opencount < 0;
}
} elsif ( $element eq '' ) {
push @list2 , $_;
} else {
$element = join ',', $element , $_;
}
}
unless ( $opencount == 0 ) {
fatal_error "Mismatched parentheses ($list)";
}
@list2;
}
# #
# Determine if a value has been supplied # Determine if a value has been supplied
# #
@ -2045,7 +2096,7 @@ sub split_line1( $$;$$ ) {
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:]]/;
my @line = split( ' ', $columns ); my @line = split_list4( $columns );
$nopad = {} unless $nopad; $nopad = {} unless $nopad;