mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

75_MSG: eval for wrong JSON format

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@10546 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
loredo
2016-01-17 01:11:52 +00:00
parent 8658246ab4
commit fedd086bf1
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/FHEM/75_MSG.pm
View File

@@ -157,12 +157,21 @@ s/^[\s\t]*([!]?(([A-Za-z0-9%+._-])*@([%+a-z0-9A-Z.-]+))[\w,@.!|:]*)[\s\t]+//
# check for advanced options # check for advanced options
if ( $msg =~ s/[\s\t]*O(\[\{.*\}\])[\s\t]*$// ) { if ( $msg =~ s/[\s\t]*O(\[\{.*\}\])[\s\t]*$// ) {
Log3 $globalDevName, 5, "msg: found options=$1";
# Use JSON module if possible # Use JSON module if possible
eval 'use JSON qw( decode_json ); 1'; eval 'use JSON qw( decode_json ); 1';
if ( !$@ ) { if ( !$@ ) {
$advanced = decode_json( Encode::encode_utf8($1) ); eval '$advanced = decode_json( Encode::encode_utf8($1) ); 1';
if (!$@) {
Log3 $globalDevName, 5, Log3 $globalDevName, 5,
"msg: Advanced options\n" . Dumper($advanced); "msg: Decoded advanced options\n" . Dumper($advanced);
}
else {
Log3 $globalDevName, 5,
"msg: Error decoding JSON for advanced options";
$advanced = "";
}
} }
else { else {
Log3 $globalDevName, 3, Log3 $globalDevName, 3,