FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

fhem.pl: guard regexp errors for event-on-* (Forum #71020)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14093 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-04-24 07:44:26 +00:00
parent 0d4904ce2c
commit dead235d8d
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fhem/fhem.pl
View File

@ -2720,10 +2720,20 @@ CommandAttr($$)
}
}
if($attrName eq "suppressReading") {
return "Argument must be a valid regexp" if(!$a[2] || $a[2] =~ /^\*/);
eval { "Hallo" =~ m/^$a[2]$/ };
return "Bad regexp: $@" if($@);
my %ra = ("suppressReading" => 1,
"event-on-update-reading" => 1,
"event-on-change-reading" => 2,
"timestamp-on-change-reading"=> 1,
"event-min-interval" => 2);
if(defined($a[2]) && $ra{$attrName}) {
my $lval = $a[2];
$lval =~ s/:.*// if($ra{$attrName} == 2);
for my $v (split(",", $lval)) {
my $err = "Argument $v for attr $sdev $a[1] is not a valid regexp";
return "$err: use .* instead of *" if($v =~ /^\*/); # no err in eval!?
eval { "Hallo" =~ m/^$v$/ };
return "$err: $@" if($@);
}
}
$ret = CallFn($sdev, "AttrFn", "set", @a);