FHEM/mod-NUKI
1
0
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

change decode_json() to eval{decode_json()}

Browse Source
This commit is contained in:
Marko Oldenburg
2018-02-27 11:25:20 +01:00
parent de1fb414a0
commit dc4a6be940
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
73_NUKIBridge.pm
View File

@@ -46,7 +46,7 @@ use JSON;
use HttpUtils; use HttpUtils;
my $version = "0.6.1"; my $version = "0.6.2";
my $bridgeapi = "1.5"; my $bridgeapi = "1.5";
@@ -476,8 +476,12 @@ sub NUKIBridge_ResponseProcessing($$$) {
Log3 $name, 3, "NUKIBridge ($name) - invalid json detected: $json"; Log3 $name, 3, "NUKIBridge ($name) - invalid json detected: $json";
return "NUKIBridge ($name) - invalid json detected: $json"; return "NUKIBridge ($name) - invalid json detected: $json";
} }
$decode_json = decode_json($json); my $decode_json = eval{decode_json($json)};
if($@){
Log3 $name, 3, "NUKIBridge ($name) - JSON error while request: $@";
return;
}
if( ref($decode_json) eq "ARRAY" and scalar(@{$decode_json}) > 0 and $path eq "list" ) { if( ref($decode_json) eq "ARRAY" and scalar(@{$decode_json}) > 0 and $path eq "list" ) {
@@ -744,8 +748,12 @@ sub NUKIBridge_CallBlocking($$$) {
return "NUKIDevice ($name) - invalid json detected for $url: $data"; return "NUKIDevice ($name) - invalid json detected for $url: $data";
} }
my $decode_json = decode_json($data); my $decode_json = eval{decode_json($data)};
if($@){
Log3 $name, 3, "NUKIBridge ($name) - JSON error while request: $@";
return;
}
return undef if( !$decode_json ); return undef if( !$decode_json );

16
74_NUKIDevice.pm
View File

@@ -33,7 +33,7 @@ use warnings;
use JSON; use JSON;
my $version = "0.6.1"; my $version = "0.6.2";
@@ -414,7 +414,11 @@ sub NUKIDevice_Parse($$) {
######################################### #########################################
#### verarbeiten des JSON Strings ####### #### verarbeiten des JSON Strings #######
my $decode_json = decode_json($result); my $decode_json = eval{decode_json($result)};
if($@){
Log3 $name, 3, "NUKIDevice ($name) - JSON error while request: $@";
return;
}
if( ref($decode_json) ne "HASH" ) { if( ref($decode_json) ne "HASH" ) {
@@ -526,8 +530,12 @@ sub NUKIDevice_CGI() {
Log3 $name, 3, "NUKIDevice ($name) - invalid json detected: $json"; Log3 $name, 3, "NUKIDevice ($name) - invalid json detected: $json";
return "NUKIDevice ($name) - invalid json detected: $json"; return "NUKIDevice ($name) - invalid json detected: $json";
} }
my $decode_json = decode_json($json); my $decode_json = eval{decode_json($json)};
if($@){
Log3 $name, 3, "NUKIDevice ($name) - JSON error while request: $@";
return;
}
if( ref($decode_json) eq "HASH" ) { if( ref($decode_json) eq "HASH" ) {