golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Catch NULL, bool, and integer values in is_serialized(). Props mdawaffe. fixes #3310 

git-svn-id: http://svn.automattic.com/wordpress/trunk@4438 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2006-10-31 08:24:09 +00:00
parent 2b1f1fd240
commit 439538aa5b
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
wp-includes/functions.php
View File

@ -163,19 +163,37 @@ function maybe_unserialize($original) {
}
function is_serialized($data) {
if ( !is_string($data) ) // if it isn't a string, it isn't serialized
// if it isn't a string, it isn't serialized
if ( !is_string($data) )
return false;
$data = trim($data);
if ( preg_match("/^[adobis]:[0-9]+:.*[;}]/si",$data) ) // this should fetch all legitimately serialized data
if ( 'N;' == $data )
return true;
if ( !preg_match('/^([adObis]):/', $data, $badions) )
return false;
switch ( $badions[1] ) :
case 'a' :
case 'O' :
case 's' :
if ( preg_match("/^{$badions[1]}:[0-9]+:.*[;}]\$/s", $data) )
return true;
break;
case 'b' :
case 'i' :
case 'd' :
if ( preg_match("/^{$badions[1]}:[0-9.E-]+;\$/", $data) )
return true;
break;
endswitch;
return false;
}
function is_serialized_string($data) {
if ( !is_string($data) ) // if it isn't a string, it isn't a serialized string
// if it isn't a string, it isn't a serialized string
if ( !is_string($data) )
return false;
$data = trim($data);
if ( preg_match("/^s:[0-9]+:.*[;}]/si",$data) ) // this should fetch all serialized strings
if ( preg_match('/^s:[0-9]+:.*;$/s',$data) ) // this should fetch all serialized strings
return true;
return false;
}
@ -1202,5 +1220,4 @@ function _mce_add_direction_buttons($input) {
return $input;
}
?>