Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fhem.pl: json2nameValue: fix parsing numbers followed by a newline (Forum #92740)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@25644 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2022-02-06 20:01:09 +00:00
parent b9866a9e38
commit a2279f3603
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/fhem.pl
View File

@ -5363,7 +5363,7 @@ json2nameValue($;$$$$)
foreach my $k (keys %r2) { foreach my $k (keys %r2) {
setVal($ret, $prefix, $firstLevel ? $k : "${name}_$k", $r2{$k}); setVal($ret, $prefix, $firstLevel ? $k : "${name}_$k", $r2{$k});
} }
return ("error parsing '$in2'", undef) if($in2 !~ m/^\s*$/); return ("error parsing (#1) '$in2'", undef) if($in2 !~ m/^\s*$/);
} elsif($val =~ m/^\[/) { } elsif($val =~ m/^\[/) {
($err, $val, $in) = lObj($val, '[', ']'); ($err, $val, $in) = lObj($val, '[', ']');
@ -5379,7 +5379,7 @@ json2nameValue($;$$$$)
$idx++; $idx++;
} }
} elsif($val =~ m/^((-?[0-9.]+)([eE][+-]?[0-9]+)?)(.*)$/ && # 125340 } elsif($val =~ m/^((-?[0-9.]+)([eE][+-]?[0-9]+)?)(.*)$/s && # 125340
looks_like_number($1)) { looks_like_number($1)) {
setVal($ret, $prefix, $name, $1); setVal($ret, $prefix, $name, $1);
$in = $4; $in = $4;
@ -5393,7 +5393,7 @@ json2nameValue($;$$$$)
$in = $2; $in = $2;
} else { } else {
return ("error parsing '$val'", undef); return ("error parsing (#2) '$val'", undef);
} }
return (undef, $in); return (undef, $in);