pajoye Tue, 28 Feb 2012 18:36:10 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=323633
Log: - fix bug #60879, unserialize does not invoke __wakeup Bug: https://bugs.php.net/60879 (Closed) unserialize() Does not invoke __wakeup() on object Changed paths: U php/php-src/branches/PHP_5_4/NEWS U php/php-src/branches/PHP_5_4/ext/standard/var_unserializer.c U php/php-src/branches/PHP_5_4/ext/standard/var_unserializer.re U php/php-src/trunk/ext/standard/var_unserializer.c U php/php-src/trunk/ext/standard/var_unserializer.re Modified: php/php-src/branches/PHP_5_4/NEWS =================================================================== --- php/php-src/branches/PHP_5_4/NEWS 2012-02-28 17:22:32 UTC (rev 323632) +++ php/php-src/branches/PHP_5_4/NEWS 2012-02-28 18:36:10 UTC (rev 323633) @@ -13,6 +13,8 @@ default (Stas). . Fixed bug #60965 (Buffer overflow on htmlspecialchars/entities with $double=false). (Gustavo) + . Fixed bug #60879 (unserialize() Does not invoke __wakeup() on object). + (Pierre, Steve) . Fixed output layer compat function not passing along input buffer with php_output_context_pass() if the output_handler_func does not set out_str (releaze3 at gmail dot com, Mike) Modified: php/php-src/branches/PHP_5_4/ext/standard/var_unserializer.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/standard/var_unserializer.c 2012-02-28 17:22:32 UTC (rev 323632) +++ php/php-src/branches/PHP_5_4/ext/standard/var_unserializer.c 2012-02-28 18:36:10 UTC (rev 323633) @@ -375,6 +375,9 @@ return elements; } +#ifdef PHP_WIN32 +# pragma optimize("", off) +#endif static inline int object_common2(UNSERIALIZE_PARAMETER, long elements) { zval *retval_ptr = NULL; @@ -399,6 +402,9 @@ return finish_nested_data(UNSERIALIZE_PASSTHRU); } +#ifdef PHP_WIN32 +# pragma optimize("", on) +#endif PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) { Modified: php/php-src/branches/PHP_5_4/ext/standard/var_unserializer.re =================================================================== --- php/php-src/branches/PHP_5_4/ext/standard/var_unserializer.re 2012-02-28 17:22:32 UTC (rev 323632) +++ php/php-src/branches/PHP_5_4/ext/standard/var_unserializer.re 2012-02-28 18:36:10 UTC (rev 323633) @@ -379,6 +379,9 @@ return elements; } +#ifdef PHP_WIN32 +# pragma optimize("", off) +#endif static inline int object_common2(UNSERIALIZE_PARAMETER, long elements) { zval *retval_ptr = NULL; @@ -403,6 +406,9 @@ return finish_nested_data(UNSERIALIZE_PASSTHRU); } +#ifdef PHP_WIN32 +# pragma optimize("", on) +#endif PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) { Modified: php/php-src/trunk/ext/standard/var_unserializer.c =================================================================== --- php/php-src/trunk/ext/standard/var_unserializer.c 2012-02-28 17:22:32 UTC (rev 323632) +++ php/php-src/trunk/ext/standard/var_unserializer.c 2012-02-28 18:36:10 UTC (rev 323633) @@ -375,6 +375,9 @@ return elements; } +#ifdef PHP_WIN32 +# pragma optimize("", off) +#endif static inline int object_common2(UNSERIALIZE_PARAMETER, long elements) { zval *retval_ptr = NULL; @@ -399,6 +402,9 @@ return finish_nested_data(UNSERIALIZE_PASSTHRU); } +#ifdef PHP_WIN32 +# pragma optimize("", on) +#endif PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) { Modified: php/php-src/trunk/ext/standard/var_unserializer.re =================================================================== --- php/php-src/trunk/ext/standard/var_unserializer.re 2012-02-28 17:22:32 UTC (rev 323632) +++ php/php-src/trunk/ext/standard/var_unserializer.re 2012-02-28 18:36:10 UTC (rev 323633) @@ -379,6 +379,9 @@ return elements; } +#ifdef PHP_WIN32 +# pragma optimize("", off) +#endif static inline int object_common2(UNSERIALIZE_PARAMETER, long elements) { zval *retval_ptr = NULL; @@ -403,6 +406,9 @@ return finish_nested_data(UNSERIALIZE_PASSTHRU); } +#ifdef PHP_WIN32 +# pragma optimize("", on) +#endif PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
