octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-27 19:54:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorder array checks

Browse Source 
Make sure that `if (isset($arr['__phpseclib_marker']))` is done on an array only.
This commit is contained in:
Joey3000 2016-02-16 20:45:05 +01:00
parent 062aa41ba0
commit 94b669d7ed
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpseclib/Crypt/Random.php
View File

@ -275,13 +275,13 @@ if (!function_exists('phpseclib_safe_serialize')) {
if (is_object($arr)) { if (is_object($arr)) {
return ''; return '';
} }
if (!is_array($arr)) {
return serialize($arr);
}
// prevent circular array recursion // prevent circular array recursion
if (isset($arr['__phpseclib_marker'])) { if (isset($arr['__phpseclib_marker'])) {
return ''; return '';
} }
if (!is_array($arr)) {
return serialize($arr);
}
$safearr = array(); $safearr = array();
$arr['__phpseclib_marker'] = true; $arr['__phpseclib_marker'] = true;
foreach (array_keys($arr) as $key) { foreach (array_keys($arr) as $key) {