pajoye                                   Sat, 10 Oct 2009 09:12:58 +0000

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

Log:
- Merge: Fixed memleak in tests/lang/engine_assignExecutionOrder_001.phpt

Changed paths:
    U   php/php-src/branches/PHP_5_3_1/Zend/zend_vm_def.h
    U   php/php-src/branches/PHP_5_3_1/Zend/zend_vm_execute.h

Modified: php/php-src/branches/PHP_5_3_1/Zend/zend_vm_def.h
===================================================================
--- php/php-src/branches/PHP_5_3_1/Zend/zend_vm_def.h   2009-10-10 08:56:28 UTC 
(rev 289492)
+++ php/php-src/branches/PHP_5_3_1/Zend/zend_vm_def.h   2009-10-10 09:12:58 UTC 
(rev 289493)
@@ -940,6 +940,7 @@

        if (opline->op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) {
                retval = 
zend_std_get_static_property(EX_T(opline->op2.u.var).class_entry, 
Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0 TSRMLS_CC);
+               FREE_OP1();
        } else {
                target_symbol_table = zend_get_target_symbol_table(opline, 
EX(Ts), type, varname TSRMLS_CC);
 /*

Modified: php/php-src/branches/PHP_5_3_1/Zend/zend_vm_execute.h
===================================================================
--- php/php-src/branches/PHP_5_3_1/Zend/zend_vm_execute.h       2009-10-10 
08:56:28 UTC (rev 289492)
+++ php/php-src/branches/PHP_5_3_1/Zend/zend_vm_execute.h       2009-10-10 
09:12:58 UTC (rev 289493)
@@ -4607,6 +4607,7 @@

        if (opline->op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) {
                retval = 
zend_std_get_static_property(EX_T(opline->op2.u.var).class_entry, 
Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0 TSRMLS_CC);
+               zval_dtor(free_op1.var);
        } else {
                target_symbol_table = zend_get_target_symbol_table(opline, 
EX(Ts), type, varname TSRMLS_CC);
 /*
@@ -7848,6 +7849,7 @@

        if (opline->op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) {
                retval = 
zend_std_get_static_property(EX_T(opline->op2.u.var).class_entry, 
Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0 TSRMLS_CC);
+               if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
        } else {
                target_symbol_table = zend_get_target_symbol_table(opline, 
EX(Ts), type, varname TSRMLS_CC);
 /*

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

Reply via email to