com php-src: Prevent "undefined variable opline" errors: Zend/zend_vm_def.h Zend/zend_vm_execute.h
| From: | Dmitry Stogov | Date: | Tue, 10 Feb 2015 15:48:09 +0000 |
| Subject: | com php-src: Prevent "undefined variable opline" errors: Zend/zend_vm_def.h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85710@lists.php.net to get a copy of this message | ||
Commit: 0294485164199ee043d8871a22e0a7a9f3d82fc8
Author: Andrea Faulds <ajf@ajf.me> Mon, 2 Feb 2015 20:07:46 +0000
Parents: 5a7ac0fadec3e5fcc22c96b0e7c9a73a9de20a32
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0294485164199ee043d8871a22e0a7a9f3d82fc8
Log:
Prevent "undefined variable opline" errors
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 c1cee36..9b4a7b0 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2958,12 +2958,15 @@ ZEND_VM_HANDLER(124, ZEND_VERIFY_RETURN_TYPE, CONST|TMP|VAR|UNUSED|CV,
UNUSED)
if (OP1_TYPE == IS_UNUSED) {
zend_verify_missing_return_type(EX(func));
} else {
+/* prevents "undefined variable opline" errors */
+#if OP1_TYPE != IS_UNUSED
zval *retval_ptr;
zend_free_op free_op1;
retval_ptr = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
/* extended_value stores strictness flag */
zend_verify_return_type(EX(func), retval_ptr, opline->extended_value);
+#endif
}
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 48b2150..83943a9 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -6109,12 +6109,15 @@ static int ZEND_FASTCALL
ZEND_VERIFY_RETURN_TYPE_SPEC_CONST_UNUSED_HANDLER(ZEND
if (IS_CONST == IS_UNUSED) {
zend_verify_missing_return_type(EX(func));
} else {
+/* prevents "undefined variable opline" errors */
+#if IS_CONST != IS_UNUSED
zval *retval_ptr;
retval_ptr = EX_CONSTANT(opline->op1);
/* extended_value stores strictness flag */
zend_verify_return_type(EX(func), retval_ptr, opline->extended_value);
+#endif
}
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
@@ -10128,12 +10131,15 @@ static int ZEND_FASTCALL
ZEND_VERIFY_RETURN_TYPE_SPEC_TMP_UNUSED_HANDLER(ZEND_O
if (IS_TMP_VAR == IS_UNUSED) {
zend_verify_missing_return_type(EX(func));
} else {
+/* prevents "undefined variable opline" errors */
+#if IS_TMP_VAR != IS_UNUSED
zval *retval_ptr;
zend_free_op free_op1;
retval_ptr = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1);
/* extended_value stores strictness flag */
zend_verify_return_type(EX(func), retval_ptr, opline->extended_value);
+#endif
}
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
@@ -14970,12 +14976,15 @@ static int ZEND_FASTCALL
ZEND_VERIFY_RETURN_TYPE_SPEC_VAR_UNUSED_HANDLER(ZEND_O
if (IS_VAR == IS_UNUSED) {
zend_verify_missing_return_type(EX(func));
} else {
+/* prevents "undefined variable opline" errors */
+#if IS_VAR != IS_UNUSED
zval *retval_ptr;
zend_free_op free_op1;
retval_ptr = _get_zval_ptr_var_deref(opline->op1.var, execute_data, &free_op1);
/* extended_value stores strictness flag */
zend_verify_return_type(EX(func), retval_ptr, opline->extended_value);
+#endif
}
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
@@ -20234,12 +20243,15 @@ static int ZEND_FASTCALL
ZEND_VERIFY_RETURN_TYPE_SPEC_UNUSED_UNUSED_HANDLER(ZEN
if (IS_UNUSED == IS_UNUSED) {
zend_verify_missing_return_type(EX(func));
} else {
+/* prevents "undefined variable opline" errors */
+#if IS_UNUSED != IS_UNUSED
zval *retval_ptr;
retval_ptr = NULL;
/* extended_value stores strictness flag */
zend_verify_return_type(EX(func), retval_ptr, opline->extended_value);
+#endif
}
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
@@ -28419,12 +28431,15 @@ static int ZEND_FASTCALL
ZEND_VERIFY_RETURN_TYPE_SPEC_CV_UNUSED_HANDLER(ZEND_OP
if (IS_CV == IS_UNUSED) {
zend_verify_missing_return_type(EX(func));
} else {
+/* prevents "undefined variable opline" errors */
+#if IS_CV != IS_UNUSED
zval *retval_ptr;
retval_ptr = _get_zval_ptr_cv_deref_BP_VAR_R(execute_data, opline->op1.var);
/* extended_value stores strictness flag */
zend_verify_return_type(EX(func), retval_ptr, opline->extended_value);
+#endif
}
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();