ambiser
/
btrbk
mirror of https://github.com/digint/btrbk
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrbk: bugfix: vinfo_match: skip match against invalid paths 

Dont check url_regex if $vinfo->{URL} is not a valid path (e.g. when
checking against a "volume" or "subvolume" having wildcards):

    "Use of uninitialized value in join or string" at line 3030
pull/334/head
Axel Burri 2019-12-14 17:06:15 +01:00
parent c36890e1eb
commit 37b30caeb2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
btrbk
View File

@ -3027,7 +3027,11 @@ sub vinfo_match($$;@)
my $vinfo = shift; my $vinfo = shift;
my %opts = @_; my %opts = @_;
my $flag_matched = $opts{flag_matched}; my $flag_matched = $opts{flag_matched};
my $url = join("", check_url($vinfo->{URL})); # sanitize URL (can contain "//", see vinfo_child)
# match URL against sane path (can contain "//", see vinfo_child),
# no wildcards
my ($url_prefix, $path) = check_url($vinfo->{URL});
my $url = defined($path) ? $url_prefix . $path : undef;
my $count = 0; my $count = 0;
foreach my $ff (@$filter) { foreach my $ff (@$filter) {
if(defined($ff->{group_eq}) && (grep { $ff->{group_eq} eq $_ } @{$vinfo->{CONFIG}{group}})) { if(defined($ff->{group_eq}) && (grep { $ff->{group_eq} eq $_ } @{$vinfo->{CONFIG}{group}})) {
@ -3037,7 +3041,7 @@ sub vinfo_match($$;@)
$ff->{$flag_matched} = 1; $ff->{$flag_matched} = 1;
$count++; $count++;
} }
if(defined($ff->{url_regex}) && ($url =~ /$ff->{url_regex}/)) { if(defined($ff->{url_regex}) && defined($url) && ($url =~ /$ff->{url_regex}/)) {
TRACE "filter \"$ff->{unparsed}\" matches $vinfo->{CONFIG}{CONTEXT} url: $vinfo->{PRINT}"; TRACE "filter \"$ff->{unparsed}\" matches $vinfo->{CONFIG}{CONTEXT} url: $vinfo->{PRINT}";
return $ff unless($flag_matched); return $ff unless($flag_matched);
#push @{$ff->{$flag_matched}}, $vinfo->{CONFIG}{CONTEXT} . '=' . $vinfo->{PRINT}; #push @{$ff->{$flag_matched}}, $vinfo->{CONFIG}{CONTEXT} . '=' . $vinfo->{PRINT};