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

30_HUEBridge.pm: eval decode_json and from_json to avoid problems with malformed input

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@9957 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme1968
2015-11-21 19:01:37 +00:00
parent a6a6990e31
commit ed5b086be1
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fhem/FHEM/30_HUEBridge.pm
View File

@@ -830,15 +830,16 @@ HUEBridge_HTTP_Call($$$;$)
return undef;
}
# try {
# from_json($ret);
# } catch {
# return undef;
# }
my $decoded;
if( HUEBridge_isFritzBox() ) {
$decoded = eval { decode_json($ret) };
Log3 $name, 2, "$name: json error: $@ in $ret" if( $@ );
} else {
$decoded = eval { from_json($ret) };
Log3 $name, 2, "$name: json error: $@ in $ret" if( $@ );
}
return HUEBridge_ProcessResponse($hash,decode_json($ret)) if( HUEBridge_isFritzBox() );
return HUEBridge_ProcessResponse($hash,from_json($ret));
return HUEBridge_ProcessResponse($hash, $decoded);
}
sub