Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-07 22:29:19 +00:00
Code

eventTypes: more checks for invalid input file and events

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3994 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2013-10-03 09:32:54 +00:00
parent 6150ea5890
commit 409ecdff4e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/91_eventTypes.pm
View File

@ -39,6 +39,10 @@ eventTypes_Define($$)
while(my $l = <$fh>) { while(my $l = <$fh>) {
chomp($l); chomp($l);
my @a = split(" ", $l, 3); my @a = split(" ", $l, 3);
if(@a != 3) {
Log3 undef, 2, "eventTypes: $f: bogus line $l";
next;
}
$modules{eventTypes}{ldata}{$a[1]}{$a[2]} = $a[0]; $modules{eventTypes}{ldata}{$a[1]}{$a[2]} = $a[0];
} }
close($fh); close($fh);
@ -60,6 +64,7 @@ eventTypes_Notify($$)
my $t = $eventSrc->{TYPE}; my $t = $eventSrc->{TYPE};
my $n = $eventSrc->{NAME}; my $n = $eventSrc->{NAME};
return if(!defined($n) || !defined($t));
my $ret = ""; my $ret = "";
foreach my $oe (@{$eventSrc->{CHANGED}}) { foreach my $oe (@{$eventSrc->{CHANGED}}) {
@ -67,6 +72,7 @@ eventTypes_Notify($$)
my $ne = $oe; my $ne = $oe;
$ne =~ s/\b-?\d*\.?\d+\b/.*/g; $ne =~ s/\b-?\d*\.?\d+\b/.*/g;
$ne =~ s/set_\d+/set_.*/; # HM special :/ $ne =~ s/set_\d+/set_.*/; # HM special :/
next if(!defined($ne) || $ne eq "");
Log3 $ln, 4, "$ln: $t $n $oe -> $ne"; Log3 $ln, 4, "$ln: $t $n $oe -> $ne";
$modules{eventTypes}{ldata}{$n}{$ne}++; $modules{eventTypes}{ldata}{$n}{$ne}++;
} }