KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix infinite recursion in metadata.pl

Browse source 
SVN-Revision: 12851
This commit is contained in:
Felix Fietkau 2008-10-04 16:22:24 +00:00
parent b9222805f0
commit 009e41906f
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/metadata.pl
View file

@ -367,7 +367,9 @@ sub mconf_depends($$) {
my $only_dep = shift; my $only_dep = shift;
my $res; my $res;
my $dep = shift; my $dep = shift;
my $seen = shift;
$dep or $dep = {}; $dep or $dep = {};
$seen or $seen = {};
$depends or return; $depends or return;
my @depends = @$depends; my @depends = @$depends;
@ -382,6 +384,8 @@ sub mconf_depends($$) {
$condition = $1; $condition = $1;
$depend = $2; $depend = $2;
} }
next if $seen->{$depend};
$seen->{$depend} = 1;
if ($vdep = $package{$depend}->{vdepends}) { if ($vdep = $package{$depend}->{vdepends}) {
$depend = join("||", map { "PACKAGE_".$_ } @$vdep); $depend = join("||", map { "PACKAGE_".$_ } @$vdep);
} else { } else {
@ -390,7 +394,7 @@ sub mconf_depends($$) {
# thus if FOO depends on other config options, these dependencies # thus if FOO depends on other config options, these dependencies
# will not be checked. To fix this, we simply emit all of FOO's # will not be checked. To fix this, we simply emit all of FOO's
# depends here as well. # depends here as well.
$package{$depend} and mconf_depends($package{$depend}->{depends}, 1, $dep); $package{$depend} and mconf_depends($package{$depend}->{depends}, 1, $dep, $seen);
$m = "select"; $m = "select";
next if $only_dep; next if $only_dep;