SAVE_OPLINE in NULL_HANDLER

Let's avoid crashing before the nice error message gets printed...

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index e564ec3c18ab69e3feccd62852466c0d49a3a473..f103e91d331a523319386c38fa40ac8420c7d6ac 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -49860,6 +49860,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_NULL_HANDLER(ZEND_OPCODE_HANDL
 {
        USE_OPLINE
 
+       SAVE_OPLINE();
        zend_error_noreturn(E_ERROR, "Invalid opcode %d/%d/%d.", OPLINE->opcode, OPLINE->op1_type, OPLINE->op2_type);
        ZEND_VM_NEXT_OPCODE(); /* Never reached */
 }

diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index aa70a6311373ea14c10feff2496188669097bf1f..d05c278c17f8550ac977cda577ae5020ed78e8da 100755 (executable)
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -1514,6 +1514,7 @@ function gen_null_handler($f) {
         out($f,"{\n");
         out($f,"\tUSE_OPLINE\n");
         out($f,"\n");
+        out($f,"\tSAVE_OPLINE();\n");
         out($f,"\tzend_error_noreturn(E_ERROR, \"Invalid opcode %d/%d/%d.\", OPLINE->opcode, OPLINE->op1_type, OPLINE->op2_type);\n");
         out($f,"\tZEND_VM_NEXT_OPCODE(); /* Never reached */\n");
         out($f,"}\n\n");