archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix memory leak with return types upon failure

Browse source 
TMP/VAR wasn't being freed in VERIFY_RETURN
This commit is contained in:
Bob Weinand 2015-05-27 01:18:06 +02:00
parent 5bec1490f9
commit f7f7d6e385
2 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Zend/zend_vm_def.h
View file

@ -3909,6 +3909,9 @@ ZEND_VM_HANDLER(124, ZEND_VERIFY_RETURN_TYPE, CONST|TMP|VAR|UNUSED|CV, UNUSED)
} }
} }
zend_verify_return_type(EX(func), retval_ptr); zend_verify_return_type(EX(func), retval_ptr);
if (EG(exception)) {
FREE_OP1();
}
#endif #endif
} }
CHECK_EXCEPTION(); CHECK_EXCEPTION();

15
Zend/zend_vm_execute.h
View file

@ -7815,6 +7815,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_CONST_
} }
} }
zend_verify_return_type(EX(func), retval_ptr); zend_verify_return_type(EX(func), retval_ptr);
if (EG(exception)) {
}
#endif #endif
} }
CHECK_EXCEPTION(); CHECK_EXCEPTION();
@ -13437,6 +13440,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_TMP_UN
} }
} }
zend_verify_return_type(EX(func), retval_ptr); zend_verify_return_type(EX(func), retval_ptr);
if (EG(exception)) {
zval_ptr_dtor_nogc(free_op1);
}
#endif #endif
} }
CHECK_EXCEPTION(); CHECK_EXCEPTION();
@ -19195,6 +19201,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_VAR_UN
} }
} }
zend_verify_return_type(EX(func), retval_ptr); zend_verify_return_type(EX(func), retval_ptr);
if (EG(exception)) {
zval_ptr_dtor_nogc(free_op1);
}
#endif #endif
} }
CHECK_EXCEPTION(); CHECK_EXCEPTION();
@ -25140,6 +25149,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_UNUSED
} }
} }
zend_verify_return_type(EX(func), retval_ptr); zend_verify_return_type(EX(func), retval_ptr);
if (EG(exception)) {
}
#endif #endif
} }
CHECK_EXCEPTION(); CHECK_EXCEPTION();
@ -34786,6 +34798,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_CV_UNU
} }
} }
zend_verify_return_type(EX(func), retval_ptr); zend_verify_return_type(EX(func), retval_ptr);
if (EG(exception)) {
}
#endif #endif
} }
CHECK_EXCEPTION(); CHECK_EXCEPTION();