From 0bfc9c6979126b2a091fa22bafbce08a51ee6a3d Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 8 Dec 2014 18:40:37 +0300 Subject: [PATCH] Fixed typo --- Zend/zend_vm_def.h | 2 +- Zend/zend_vm_execute.h | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 47dfeec080..8f3b60f2ef 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -4555,7 +4555,7 @@ ZEND_VM_C_LABEL(num_index_dim): //??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset TSRMLS_CC); FREE_OP2(); - } else if (UNEXPECTED(Z_TYPE_P(container) == IS_OBJECT)) { + } else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) { zend_error_noreturn(E_ERROR, "Cannot unset string offsets"); ZEND_VM_CONTINUE(); /* bailed out before */ } else { diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 9531d85fe1..8975d23124 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -13518,7 +13518,7 @@ num_index_dim: //??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset TSRMLS_CC); - } else if (UNEXPECTED(Z_TYPE_P(container) == IS_OBJECT)) { + } else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) { zend_error_noreturn(E_ERROR, "Cannot unset string offsets"); ZEND_VM_CONTINUE(); /* bailed out before */ } else { @@ -16350,7 +16350,7 @@ num_index_dim: //??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset TSRMLS_CC); - } else if (UNEXPECTED(Z_TYPE_P(container) == IS_OBJECT)) { + } else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) { zend_error_noreturn(E_ERROR, "Cannot unset string offsets"); ZEND_VM_CONTINUE(); /* bailed out before */ } else { @@ -17790,7 +17790,7 @@ num_index_dim: //??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset TSRMLS_CC); zval_ptr_dtor_nogc(free_op2); - } else if (UNEXPECTED(Z_TYPE_P(container) == IS_OBJECT)) { + } else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) { zend_error_noreturn(E_ERROR, "Cannot unset string offsets"); ZEND_VM_CONTINUE(); /* bailed out before */ } else { @@ -19088,7 +19088,7 @@ num_index_dim: //??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset TSRMLS_CC); - } else if (UNEXPECTED(Z_TYPE_P(container) == IS_OBJECT)) { + } else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) { zend_error_noreturn(E_ERROR, "Cannot unset string offsets"); ZEND_VM_CONTINUE(); /* bailed out before */ } else { @@ -21177,7 +21177,7 @@ num_index_dim: //??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset TSRMLS_CC); - } else if (UNEXPECTED(Z_TYPE_P(container) == IS_OBJECT)) { + } else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) { zend_error_noreturn(E_ERROR, "Cannot unset string offsets"); ZEND_VM_CONTINUE(); /* bailed out before */ } else { @@ -22572,7 +22572,7 @@ num_index_dim: //??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset TSRMLS_CC); zval_ptr_dtor_nogc(free_op2); - } else if (UNEXPECTED(Z_TYPE_P(container) == IS_OBJECT)) { + } else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) { zend_error_noreturn(E_ERROR, "Cannot unset string offsets"); ZEND_VM_CONTINUE(); /* bailed out before */ } else { @@ -26131,7 +26131,7 @@ num_index_dim: //??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset TSRMLS_CC); - } else if (UNEXPECTED(Z_TYPE_P(container) == IS_OBJECT)) { + } else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) { zend_error_noreturn(E_ERROR, "Cannot unset string offsets"); ZEND_VM_CONTINUE(); /* bailed out before */ } else { @@ -30129,7 +30129,7 @@ num_index_dim: //??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset TSRMLS_CC); - } else if (UNEXPECTED(Z_TYPE_P(container) == IS_OBJECT)) { + } else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) { zend_error_noreturn(E_ERROR, "Cannot unset string offsets"); ZEND_VM_CONTINUE(); /* bailed out before */ } else { @@ -32084,7 +32084,7 @@ num_index_dim: //??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset TSRMLS_CC); zval_ptr_dtor_nogc(free_op2); - } else if (UNEXPECTED(Z_TYPE_P(container) == IS_OBJECT)) { + } else if (UNEXPECTED(Z_TYPE_P(container) == IS_STRING)) { zend_error_noreturn(E_ERROR, "Cannot unset string offsets"); ZEND_VM_CONTINUE(); /* bailed out before */ } else { -- 2.40.0