From c2e7150019e90178a8c67ecb1eb26e9863eef54e Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Mon, 20 Apr 2015 14:27:10 +0000 Subject: [PATCH] 92_FileLog/98_SVG: avoid crash when input file is non-existent (compressed NTP loopstats) git-svn-id: https://svn.fhem.de/fhem/trunk@8457 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/92_FileLog.pm | 4 ++-- fhem/FHEM/98_SVG.pm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/92_FileLog.pm b/fhem/FHEM/92_FileLog.pm index f902cc9a2..cb7611f88 100755 --- a/fhem/FHEM/92_FileLog.pm +++ b/fhem/FHEM/92_FileLog.pm @@ -923,6 +923,7 @@ FileLog_sampleDataFn($$$$$) { my ($flName, $flog, $max, $conf, $wName) = @_; my $desc = "Input:Column,Regexp,DefaultValue,Function"; + my @htmlArr; my $fName = $defs{$flName}{currentlogfile}; my $reformatFn = AttrVal($flName, "reformatFn", ""); @@ -930,7 +931,7 @@ FileLog_sampleDataFn($$$$$) if(!$fh) { $fName = "" if(!defined($fName)); Log3 $wName, 1, "FileLog get sample data: $fName: $!"; - return ($desc, undef, ""); + return ($desc, \@htmlArr, ""); } $fh->seek(0, 2); # Go to the end my $sz = $fh->tell; @@ -961,7 +962,6 @@ FileLog_sampleDataFn($$$$$) FileLog_addTics($conf->{y2tics}, \%tickh); $colnums = join(",", sort keys %tickh).",$colnums" if(%tickh); - my @htmlArr; for(my $r=0; $r < $max; $r++) { my @f = split(":", ($flog->[$r] ? $flog->[$r] : ":::"), 4); my $ret = ""; diff --git a/fhem/FHEM/98_SVG.pm b/fhem/FHEM/98_SVG.pm index d2a946ac3..c78c72f3e 100755 --- a/fhem/FHEM/98_SVG.pm +++ b/fhem/FHEM/98_SVG.pm @@ -381,7 +381,7 @@ SVG_PEdit($$$$) &{$fn}($src, \@argArr, $lmax,\%conf, $FW_wname); use strict "refs"; $desc = $ldesc; - push @paramHtml, @{$paramHtml}; + push @paramHtml, @{$paramHtml} if($paramHtml); map { push @exampleHtml, $example } (0..$lmax-1); } else {