diff options
| author | Matt Wilmas <mattwil@php.net> | 2009-03-17 22:04:10 +0000 |
|---|---|---|
| committer | Matt Wilmas <mattwil@php.net> | 2009-03-17 22:04:10 +0000 |
| commit | 927880b5cc593ca816c4f2170db7992b996f1b9a (patch) | |
| tree | 7a043556f6f0dea459dc476fa0dee530d1710267 /ext/standard/var_unserializer.re | |
| parent | c3fcaf1d7d1f663080a7c14c0e561077e44229ae (diff) | |
| download | php-git-927880b5cc593ca816c4f2170db7992b996f1b9a.tar.gz | |
MFH: Fixed bug #46882 (Serialize / Unserialize misbehaviour under OS with different bit numbers)
Diffstat (limited to 'ext/standard/var_unserializer.re')
| -rw-r--r-- | ext/standard/var_unserializer.re | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 3661641857..97710e4bcc 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -460,6 +460,26 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) } "i:" iv ";" { +#if SIZEOF_LONG == 4 + int digits = YYCURSOR - start - 3; + + if (start[2] == '-' || start[2] == '+') { + digits--; + } + + /* Use double for large long values that were serialized on a 64-bit system */ + if (digits >= MAX_LENGTH_OF_LONG - 1) { + if (digits == MAX_LENGTH_OF_LONG - 1) { + int cmp = strncmp(YYCURSOR - MAX_LENGTH_OF_LONG, long_min_digits, MAX_LENGTH_OF_LONG - 1); + + if (!(cmp < 0 || (cmp == 0 && start[2] == '-'))) { + goto use_double; + } + } else { + goto use_double; + } + } +#endif *p = YYCURSOR; INIT_PZVAL(*rval); ZVAL_LONG(*rval, parse_iv(start + 2)); @@ -482,6 +502,9 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) } "d:" (iv | nv | nvexp) ";" { +#if SIZEOF_LONG == 4 +use_double: +#endif *p = YYCURSOR; INIT_PZVAL(*rval); ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL)); |