clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed memory leak in case of exception in iterator callbacks in 'foreach(new Iterator()...' (spl/tests/iterator_047.phpt).

Browse Source
This commit is contained in:
Dmitry Stogov 2006-07-11 08:52:44 +00:00
parent ecb58ee2cd
commit b52137a828
2 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Zend/zend_vm_def.h
View File

@ -3166,6 +3166,11 @@ ZEND_VM_HANDLER(77, ZEND_FE_RESET, CONST|TMP|VAR|CV, ANY)
if (EG(exception)) {
array_ptr->refcount--;
zval_ptr_dtor(&array_ptr);
if (opline->extended_value & ZEND_FE_RESET_VARIABLE) {
FREE_OP1_VAR_PTR();
} else {
FREE_OP1_IF_VAR();
}
ZEND_VM_NEXT_OPCODE();
}
}
@ -3173,6 +3178,11 @@ ZEND_VM_HANDLER(77, ZEND_FE_RESET, CONST|TMP|VAR|CV, ANY)
if (EG(exception)) {
array_ptr->refcount--;
zval_ptr_dtor(&array_ptr);
if (opline->extended_value & ZEND_FE_RESET_VARIABLE) {
FREE_OP1_VAR_PTR();
} else {
FREE_OP1_IF_VAR();
}
ZEND_VM_NEXT_OPCODE();
}
iter->index = -1; /* will be set to 0 before using next handler */

40
Zend/zend_vm_execute.h
View File

@ -2130,6 +2130,11 @@ static int ZEND_FE_RESET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
if (EG(exception)) {
array_ptr->refcount--;
zval_ptr_dtor(&array_ptr);
if (opline->extended_value & ZEND_FE_RESET_VARIABLE) {
} else {
}
ZEND_VM_NEXT_OPCODE();
}
}
@ -2137,6 +2142,11 @@ static int ZEND_FE_RESET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
if (EG(exception)) {
array_ptr->refcount--;
zval_ptr_dtor(&array_ptr);
if (opline->extended_value & ZEND_FE_RESET_VARIABLE) {
} else {
}
ZEND_VM_NEXT_OPCODE();
}
iter->index = -1; /* will be set to 0 before using next handler */
@ -4686,6 +4696,11 @@ static int ZEND_FE_RESET_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
if (EG(exception)) {
array_ptr->refcount--;
zval_ptr_dtor(&array_ptr);
if (opline->extended_value & ZEND_FE_RESET_VARIABLE) {
} else {
}
ZEND_VM_NEXT_OPCODE();
}
}
@ -4693,6 +4708,11 @@ static int ZEND_FE_RESET_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
if (EG(exception)) {
array_ptr->refcount--;
zval_ptr_dtor(&array_ptr);
if (opline->extended_value & ZEND_FE_RESET_VARIABLE) {
} else {
}
ZEND_VM_NEXT_OPCODE();
}
iter->index = -1; /* will be set to 0 before using next handler */
@ -7839,6 +7859,11 @@ static int ZEND_FE_RESET_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
if (EG(exception)) {
array_ptr->refcount--;
zval_ptr_dtor(&array_ptr);
if (opline->extended_value & ZEND_FE_RESET_VARIABLE) {
if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
} else {
if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
}
ZEND_VM_NEXT_OPCODE();
}
}
@ -7846,6 +7871,11 @@ static int ZEND_FE_RESET_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
if (EG(exception)) {
array_ptr->refcount--;
zval_ptr_dtor(&array_ptr);
if (opline->extended_value & ZEND_FE_RESET_VARIABLE) {
if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
} else {
if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
}
ZEND_VM_NEXT_OPCODE();
}
iter->index = -1; /* will be set to 0 before using next handler */
@ -20588,6 +20618,11 @@ static int ZEND_FE_RESET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
if (EG(exception)) {
array_ptr->refcount--;
zval_ptr_dtor(&array_ptr);
if (opline->extended_value & ZEND_FE_RESET_VARIABLE) {
} else {
}
ZEND_VM_NEXT_OPCODE();
}
}
@ -20595,6 +20630,11 @@ static int ZEND_FE_RESET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
if (EG(exception)) {
array_ptr->refcount--;
zval_ptr_dtor(&array_ptr);
if (opline->extended_value & ZEND_FE_RESET_VARIABLE) {
} else {
}
ZEND_VM_NEXT_OPCODE();
}
iter->index = -1; /* will be set to 0 before using next handler */