extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-08-09 07:31:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correct nested ?IF

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep
2012-03-19 08:19:32 -07:00
parent 962b1cca1f
commit 86f3667b82
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1534,7 +1534,7 @@ sub process_conditional( $$ ) {
$rest = '' unless supplied $rest; $rest = '' unless supplied $rest;
my ( $lastkeyword, $lastomit, $lastlinenumber ) = @ifstack ? @{$ifstack[-1]} : ('', 0, 0 ); my ( $lastkeyword, $prioromit, $lastomit, $lastlinenumber ) = @ifstack ? @{$ifstack[-1]} : ('', 0, 0, 0 );
if ( $keyword =~ /^IF/ ) { if ( $keyword =~ /^IF/ ) {
fatal_error "Missing IF variable" unless $rest; fatal_error "Missing IF variable" unless $rest;
@ -1542,7 +1542,7 @@ sub process_conditional( $$ ) {
fatal_error "Invalid IF variable ($rest)" unless $rest =~ s/^\$// && $rest =~ /^\w+$/; fatal_error "Invalid IF variable ($rest)" unless $rest =~ s/^\$// && $rest =~ /^\w+$/;
push @ifstack, [ 'IF', $omitting, $currentlinenumber ]; push @ifstack, [ 'IF', $lastomit, $omitting, $currentlinenumber ];
if ( $rest eq '__IPV6' ) { if ( $rest eq '__IPV6' ) {
$omitting = $family == F_IPV4; $omitting = $family == F_IPV4;
@ -1561,10 +1561,11 @@ sub process_conditional( $$ ) {
fatal_error "Invalid ?ELSE" unless $rest eq ''; fatal_error "Invalid ?ELSE" unless $rest eq '';
fatal_error "?ELSE has no matching ?IF" unless @ifstack > $ifstack && $lastkeyword eq 'IF'; fatal_error "?ELSE has no matching ?IF" unless @ifstack > $ifstack && $lastkeyword eq 'IF';
$omitting = ! $omitting unless $lastomit; $omitting = ! $omitting unless $lastomit;
$ifstack[-1] = [ 'ELSE', $prioromit, $omitting, $lastlinenumber ];
} else { } else {
fatal_error "Invalid ?ENDIF" unless $rest eq ''; fatal_error "Invalid ?ENDIF" unless $rest eq '';
fatal_error q(Unexpected "?ENDIF" without matching ?IF or ?ELSE) if @ifstack <= $ifstack; fatal_error q(Unexpected "?ENDIF" without matching ?IF or ?ELSE) if @ifstack <= $ifstack;
$omitting = $lastomit; $omitting = $prioromit;
pop @ifstack; pop @ifstack;
} }