com php-src: Fixed memory leaks: Zend/tests/type_declarations /typed_properties_045.phpt Zend/zend_vm_def .h Zend/zend_vm_execute.h
| From: | Bob Weinand | Date: | Tue, 24 May 2016 12:59:48 +0000 |
| Subject: | com php-src: Fixed memory leaks: Zend/tests/type_declarations /typed_properties_045.phpt Zend/zend_vm_def .h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95542@lists.php.net to get a copy of this message | ||
Commit: 4705b9ff00f62b2da924d06470eddffd3b9aa588
Author: Dmitry Stogov <dmitry@zend.com> Tue, 24 May 2016 15:59:48 +0300
Parents: 2ce08cab29b1f48ddbad9f46587a8640022d96eb
Branches: typed_ref_properties
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4705b9ff00f62b2da924d06470eddffd3b9aa588
Log:
Fixed memory leaks
Changed paths:
A Zend/tests/type_declarations/typed_properties_045.phpt
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/tests/type_declarations/typed_properties_045.phpt
b/Zend/tests/type_declarations/typed_properties_045.phpt
new file mode 100644
index 0000000..6218564
--- /dev/null
+++ b/Zend/tests/type_declarations/typed_properties_045.phpt
@@ -0,0 +1,15 @@
+--TEST--
+foreach() leaks on object with typed properties
+--FILE--
+<?php
+class Foo {
+ public int $bar;
+}
+
+try {
+ foreach (new Foo() as &$val) {}
+} catch (Throwable $e) {
+ echo $e->getMessage() . "\n";
+}
+--EXPECT--
+Typed properties exist in Foo: foreach by reference is disallowed
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 97c36bb..1992047 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -5904,6 +5904,11 @@ ZEND_VM_HANDLER(125, ZEND_FE_RESET_RW, CONST|TMP|VAR|CV, JMP_ADDR)
zend_ce_type_error, 0,
"Typed properties exist in %s: foreach by reference is disallowed",
ZSTR_VAL(Z_OBJCE_P(array_ptr)->name));
+ if (OP1_TYPE == IS_VAR) {
+ FREE_OP1_VAR_PTR();
+ } else {
+ FREE_OP1();
+ }
HANDLE_EXCEPTION();
}
@@ -5951,6 +5956,11 @@ ZEND_VM_HANDLER(125, ZEND_FE_RESET_RW, CONST|TMP|VAR|CV, JMP_ADDR)
zend_ce_type_error, 0,
"Typed properties exist in %s: foreach by reference is disallowed",
ZSTR_VAL(Z_OBJCE_P(array_ptr)->name));
+ if (OP1_TYPE == IS_VAR) {
+ FREE_OP1_VAR_PTR();
+ } else {
+ FREE_OP1();
+ }
HANDLE_EXCEPTION();
}
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 73c7c69..56e8166 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -3588,6 +3588,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_FE_RESET_RW_SPEC_CONST_HANDLER
zend_ce_type_error, 0,
"Typed properties exist in %s: foreach by reference is disallowed",
ZSTR_VAL(Z_OBJCE_P(array_ptr)->name));
+ if (IS_CONST == IS_VAR) {
+
+ } else {
+
+ }
HANDLE_EXCEPTION();
}
@@ -3634,6 +3639,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_FE_RESET_RW_SPEC_CONST_HANDLER
zend_ce_type_error, 0,
"Typed properties exist in %s: foreach by reference is disallowed",
ZSTR_VAL(Z_OBJCE_P(array_ptr)->name));
+ if (IS_CONST == IS_VAR) {
+
+ } else {
+
+ }
HANDLE_EXCEPTION();
}
@@ -12702,6 +12712,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_FE_RESET_RW_SPEC_TMP_HANDLER(Z
zend_ce_type_error, 0,
"Typed properties exist in %s: foreach by reference is disallowed",
ZSTR_VAL(Z_OBJCE_P(array_ptr)->name));
+ if (IS_TMP_VAR == IS_VAR) {
+
+ } else {
+ zval_ptr_dtor_nogc(free_op1);
+ }
HANDLE_EXCEPTION();
}
@@ -12748,6 +12763,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_FE_RESET_RW_SPEC_TMP_HANDLER(Z
zend_ce_type_error, 0,
"Typed properties exist in %s: foreach by reference is disallowed",
ZSTR_VAL(Z_OBJCE_P(array_ptr)->name));
+ if (IS_TMP_VAR == IS_VAR) {
+
+ } else {
+ zval_ptr_dtor_nogc(free_op1);
+ }
HANDLE_EXCEPTION();
}
@@ -16240,6 +16260,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_FE_RESET_RW_SPEC_VAR_HANDLER(Z
zend_ce_type_error, 0,
"Typed properties exist in %s: foreach by reference is disallowed",
ZSTR_VAL(Z_OBJCE_P(array_ptr)->name));
+ if (IS_VAR == IS_VAR) {
+ if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
+ } else {
+ zval_ptr_dtor_nogc(free_op1);
+ }
HANDLE_EXCEPTION();
}
@@ -16287,6 +16312,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_FE_RESET_RW_SPEC_VAR_HANDLER(Z
zend_ce_type_error, 0,
"Typed properties exist in %s: foreach by reference is disallowed",
ZSTR_VAL(Z_OBJCE_P(array_ptr)->name));
+ if (IS_VAR == IS_VAR) {
+ if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
+ } else {
+ zval_ptr_dtor_nogc(free_op1);
+ }
HANDLE_EXCEPTION();
}
@@ -38842,6 +38872,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_FE_RESET_RW_SPEC_CV_HANDLER(ZE
zend_ce_type_error, 0,
"Typed properties exist in %s: foreach by reference is disallowed",
ZSTR_VAL(Z_OBJCE_P(array_ptr)->name));
+ if (IS_CV == IS_VAR) {
+
+ } else {
+
+ }
HANDLE_EXCEPTION();
}
@@ -38888,6 +38923,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_FE_RESET_RW_SPEC_CV_HANDLER(ZE
zend_ce_type_error, 0,
"Typed properties exist in %s: foreach by reference is disallowed",
ZSTR_VAL(Z_OBJCE_P(array_ptr)->name));
+ if (IS_CV == IS_VAR) {
+
+ } else {
+
+ }
HANDLE_EXCEPTION();
}