FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-09 14:47:00 +00:00
Code Issues Releases Wiki Activity

93_DbLog: use of uninitialized value $txt if addlog has no value

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16034 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2018-01-29 10:53:36 +00:00
parent 6b2bc397b1
commit 5edc108a37
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it.
- bugfix: 93_DbLog: use of uninitialized value $txt if addlog has no value
- feature: 33_readingsGroup: added german commandref (by HomeAuto_User)
- feature: 10_pilight_ctrl: support bh1750 illuminance sensor
- feature: 71_YAMAHA_NP: Added player readings support for

12
fhem/FHEM/93_DbLog.pm
View File

@ -16,6 +16,7 @@
############################################################################################################################################
# Versions History done by DS_Starter & DeeSPe:
#
# 3.8.1 29.01.2018 Use of uninitialized value $txt if addlog has no value
# 3.8.0 26.01.2018 escape "|" in events to log events containing it
# 3.7.1 25.01.2018 fix typo in commandref
# 3.7.0 21.01.2018 parsed event with Log 5 added, configCheck enhanced by configuration read check
@ -181,7 +182,7 @@ use Blocking;
use Time::HiRes qw(gettimeofday tv_interval);
use Encode qw(encode_utf8);
my $DbLogVersion = "3.8.0";
my $DbLogVersion = "3.8.1";
my %columns = ("DEVICE" => 64,
"TYPE" => 64,
@ -3445,8 +3446,6 @@ sub DbLog_AddLog($$$) {
return if(IsDisabled($name) || !$hash->{HELPER}{COLSET} || $init_done != 1);
$value = DbLog_charfilter($value) if(AttrVal($name, "useCharfilter",0));
# Funktion aus Attr valueFn validieren
if( $value_fn =~ m/^\s*(\{.*\})\s*$/s ) {
$value_fn = $1;
@ -3529,7 +3528,12 @@ sub DbLog_AddLog($$$) {
no warnings 'uninitialized';
# Daten auf maximale Länge beschneiden
($dev_name,$dev_type,$event,$dev_reading,$read_val,$ut) = DbLog_cutCol($hash,$dev_name,$dev_type,$event,$dev_reading,$read_val,$ut);
if(AttrVal($name, "useCharfilter",0)) {
$dev_reading = DbLog_charfilter($dev_reading);
$read_val = DbLog_charfilter($read_val);
}
my $row = ($ts."|".$dev_name."|".$dev_type."|".$event."|".$dev_reading."|".$read_val."|".$ut);
Log3 $hash->{NAME}, 3, "DbLog $name -> addLog created - TS: $ts, Device: $dev_name, Type: $dev_type, Event: $event, Reading: $dev_reading, Value: $read_val, Unit: $ut"
if(!AttrVal($name, "suppressAddLogV3",0));