Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 12:01:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try catch on eval

Browse Source
This commit is contained in:
Laurent Destailleur
2020-09-27 21:10:27 +02:00
parent 4ca481335b
commit 1aaf1fe357
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/lib/json.lib.php
View File

@@ -245,9 +245,16 @@ function dol_json_decode($json, $assoc = false)
$out = _unval($out); $out = _unval($out);
$array = array();
// Return an array // Return an array
if ($out != '') eval('$array = '.$out.';'); if ($out != '') {
else $array = array(); try {
eval('$array = '.$out.';');
} catch(Exception $e) {
$array = array();
}
}
// Return an object // Return an object
if (!$assoc) if (!$assoc)