[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/spl/php_spl.c branches/PHP_5_4/ext/spl/php_spl.c trunk/ext/spl/php_spl.c

[Felipe Pena]

felipe                                   Wed, 12 Oct 2011 01:03:15 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=318040

Log:
- Fixed bug #60042 (spl_autoload_call may manipulate a dangling pointer)
  patch by: tom at punkave dot com

Bug: https://bugs.php.net/60042 (Open) spl_autoload_call may manipulate a 
dangling pointer
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/spl/php_spl.c
    U   php/php-src/branches/PHP_5_4/ext/spl/php_spl.c
    U   php/php-src/trunk/ext/spl/php_spl.c

Modified: php/php-src/branches/PHP_5_3/ext/spl/php_spl.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/php_spl.c      2011-10-11 21:53:53 UTC 
(rev 318039)
+++ php/php-src/branches/PHP_5_3/ext/spl/php_spl.c      2011-10-12 01:03:15 UTC 
(rev 318040)
@@ -406,6 +406,7 @@
                        zend_exception_save(TSRMLS_C);
                        if (retval) {
                                zval_ptr_dtor(&retval);
+                               retval = NULL;
                        }
                        if (zend_hash_exists(EG(class_table), lc_name, 
class_name_len + 1)) {
                                break;

Modified: php/php-src/branches/PHP_5_4/ext/spl/php_spl.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/spl/php_spl.c      2011-10-11 21:53:53 UTC 
(rev 318039)
+++ php/php-src/branches/PHP_5_4/ext/spl/php_spl.c      2011-10-12 01:03:15 UTC 
(rev 318040)
@@ -453,6 +453,7 @@
                        zend_exception_save(TSRMLS_C);
                        if (retval) {
                                zval_ptr_dtor(&retval);
+                               retval = NULL;
                        }
                        if (zend_hash_exists(EG(class_table), lc_name, 
class_name_len + 1)) {
                                break;

Modified: php/php-src/trunk/ext/spl/php_spl.c
===================================================================
--- php/php-src/trunk/ext/spl/php_spl.c 2011-10-11 21:53:53 UTC (rev 318039)
+++ php/php-src/trunk/ext/spl/php_spl.c 2011-10-12 01:03:15 UTC (rev 318040)
@@ -453,6 +453,7 @@
                        zend_exception_save(TSRMLS_C);
                        if (retval) {
                                zval_ptr_dtor(&retval);
+                               retval = NULL;
                        }
                        if (zend_hash_exists(EG(class_table), lc_name, 
class_name_len + 1)) {
                                break;


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php