diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php index bdd5f622838..57ed320afda 100644 --- a/htdocs/core/lib/json.lib.php +++ b/htdocs/core/lib/json.lib.php @@ -245,9 +245,16 @@ function dol_json_decode($json, $assoc = false) $out = _unval($out); + $array = array(); + // Return an array - if ($out != '') eval('$array = '.$out.';'); - else $array = array(); + if ($out != '') { + try { + eval('$array = '.$out.';'); + } catch(Exception $e) { + $array = array(); + } + } // Return an object if (!$assoc)