com php-src: Fixed memory leak in ZEND_JMPZ_EX (op1 and result may share same slot): Zend/zend _vm_def.h Zend/zend_vm_execute.h
| From: | Xinchen Hui | Date: | Thu, 30 Oct 2014 08:00:08 +0000 |
| Subject: | com php-src: Fixed memory leak in ZEND_JMPZ_EX (op1 and result may share same slot): Zend/zend _vm_def.h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82886@lists.php.net to get a copy of this message | ||
Commit: af22cd665cbcbdfa07a3707d0651f719e023f0ec
Author: Xinchen Hui <laruence@php.net> Thu, 30 Oct 2014 16:00:08 +0800
Parents: 429b0bb38a32b85e2f56d7669724f1c5aa902baa
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=af22cd665cbcbdfa07a3707d0651f719e023f0ec
Log:
Fixed memory leak in ZEND_JMPZ_EX (op1 and result may share same slot)
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 72fbf7f..9f2d26a 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1910,13 +1910,14 @@ ZEND_VM_HANDLER(46, ZEND_JMPZ_EX, CONST|TMP|VAR|CV, ANY)
}
if (i_zend_is_true(val TSRMLS_CC)) {
+ FREE_OP1();
ZVAL_TRUE(EX_VAR(opline->result.var));
opline++;
} else {
+ FREE_OP1();
ZVAL_FALSE(EX_VAR(opline->result.var));
opline = opline->op2.jmp_addr;
}
- FREE_OP1();
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
@@ -3773,7 +3774,7 @@ ZEND_VM_HANDLER(99, ZEND_FETCH_CONSTANT, VAR|CONST|UNUSED, CONST)
} else if ((c = zend_quick_get_constant(opline->op2.zv + 1, opline->extended_value
TSRMLS_CC)) == NULL) {
if ((opline->extended_value & IS_CONSTANT_UNQUALIFIED) != 0) {
char *actual = (char *)zend_memrchr(Z_STRVAL_P(opline->op2.zv), '\\',
Z_STRLEN_P(opline->op2.zv));
- if(!actual) {
+ if (!actual) {
actual = Z_STRVAL_P(opline->op2.zv);
} else {
actual++;
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 94466c5..732c3f0 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2497,13 +2497,14 @@ static int ZEND_FASTCALL
ZEND_JMPZ_EX_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_AR
}
if (i_zend_is_true(val TSRMLS_CC)) {
+
ZVAL_TRUE(EX_VAR(opline->result.var));
opline++;
} else {
+
ZVAL_FALSE(EX_VAR(opline->result.var));
opline = opline->op2.jmp_addr;
}
-
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
@@ -4298,7 +4299,7 @@ static int ZEND_FASTCALL
ZEND_FETCH_CONSTANT_SPEC_CONST_CONST_HANDLER(ZEND_OPCO
} else if ((c = zend_quick_get_constant(opline->op2.zv + 1, opline->extended_value
TSRMLS_CC)) == NULL) {
if ((opline->extended_value & IS_CONSTANT_UNQUALIFIED) != 0) {
char *actual = (char *)zend_memrchr(Z_STRVAL_P(opline->op2.zv), '\\',
Z_STRLEN_P(opline->op2.zv));
- if(!actual) {
+ if (!actual) {
actual = Z_STRVAL_P(opline->op2.zv);
} else {
actual++;
@@ -9336,13 +9337,14 @@ static int ZEND_FASTCALL
ZEND_JMPZ_EX_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS
}
if (i_zend_is_true(val TSRMLS_CC)) {
+ zval_ptr_dtor_nogc(free_op1.var);
ZVAL_TRUE(EX_VAR(opline->result.var));
opline++;
} else {
+ zval_ptr_dtor_nogc(free_op1.var);
ZVAL_FALSE(EX_VAR(opline->result.var));
opline = opline->op2.jmp_addr;
}
- zval_ptr_dtor_nogc(free_op1.var);
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
@@ -15920,13 +15922,14 @@ static int ZEND_FASTCALL
ZEND_JMPZ_EX_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS
}
if (i_zend_is_true(val TSRMLS_CC)) {
+ zval_ptr_dtor_nogc(free_op1.var);
ZVAL_TRUE(EX_VAR(opline->result.var));
opline++;
} else {
+ zval_ptr_dtor_nogc(free_op1..var);
ZVAL_FALSE(EX_VAR(opline->result.var));
opline = opline->op2.jmp_addr;
}
- zval_ptr_dtor_nogc(free_op1.var);
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
@@ -18946,7 +18949,7 @@ static int ZEND_FASTCALL
ZEND_FETCH_CONSTANT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE
} else if ((c = zend_quick_get_constant(opline->op2.zv + 1, opline->extended_value
TSRMLS_CC)) == NULL) {
if ((opline->extended_value & IS_CONSTANT_UNQUALIFIED) != 0) {
char *actual = (char *)zend_memrchr(Z_STRVAL_P(opline->op2.zv), '\\',
Z_STRLEN_P(opline->op2.zv));
- if(!actual) {
+ if (!actual) {
actual = Z_STRVAL_P(opline->op2.zv);
} else {
actual++;
@@ -28230,7 +28233,7 @@ static int ZEND_FASTCALL
ZEND_FETCH_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPC
} else if ((c = zend_quick_get_constant(opline->op2.zv + 1, opline->extended_value
TSRMLS_CC)) == NULL) {
if ((opline->extended_value & IS_CONSTANT_UNQUALIFIED) != 0) {
char *actual = (char *)zend_memrchr(Z_STRVAL_P(opline->op2.zv), '\\',
Z_STRLEN_P(opline->op2.zv));
- if(!actual) {
+ if (!actual) {
actual = Z_STRVAL_P(opline->op2.zv);
} else {
actual++;
@@ -33369,13 +33372,14 @@ static int ZEND_FASTCALL
ZEND_JMPZ_EX_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
}
if (i_zend_is_true(val TSRMLS_CC)) {
+
ZVAL_TRUE(EX_VAR(opline->result.var));
opline++;
} else {
+
ZVAL_FALSE(EX_VAR(opline->result.var));
opline = opline->op2.jmp_addr;
}
-
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}