Fixed typo
authorDmitry Stogov <dmitry@zend.com>
Mon, 8 Dec 2014 15:40:37 +0000 (18:40 +0300)
committerDmitry Stogov <dmitry@zend.com>
Mon, 8 Dec 2014 15:40:37 +0000 (18:40 +0300)
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

index 47dfeec0808ec89a508161a020bf3315c01a1c56..8f3b60f2efd4fb5f6af18dd7323df0a0eaf00fa8 100644 (file)
@@ -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 {
index 9531d85fe109f2d5d0869abd70c465737b5cf839..8975d23124e4878bdcd75c70d77d01b639e9c618 100644 (file)
@@ -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 {