]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d779509)
Removed wrong error messages
authorDmitry Stogov <dmitry@zend.com>
Mon, 6 Apr 2015 15:10:45 +0000 (18:10 +0300)
committerDmitry Stogov <dmitry@zend.com>
Mon, 6 Apr 2015 15:10:45 +0000 (18:10 +0300)
Zend/zend_vm_def.h patch | blob | history
Zend/zend_vm_execute.h patch | blob | history

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index e6d392a65a86d10ca180066c5951bb4b6f543904..17c2041b3d0680c308a255a5e728d5605b4c452b 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -6197,9 +6197,7 @@ ZEND_VM_HANDLER(114, ZEND_ISSET_ISEMPTY_VAR, CONST|TMPVAR|CV, UNUSED|CONST|VAR)
 
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-                                               FREE_OP1();
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        ZEND_VM_C_GOTO(is_var_return);
@@ -6220,9 +6218,7 @@ ZEND_VM_HANDLER(114, ZEND_ISSET_ISEMPTY_VAR, CONST|TMPVAR|CV, UNUSED|CONST|VAR)
                                
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-                                               FREE_OP1();
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        ZEND_VM_C_GOTO(is_var_return);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 5369c44b79db2005ce50954085b1e65deb720451..8c23e7c5b14b6fd9749b9ea81f66f95368cadebe 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -5596,9 +5596,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_C
 
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        goto is_var_return;
@@ -5619,9 +5617,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_C
 
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        goto is_var_return;
@@ -6521,9 +6517,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_V
 
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        goto is_var_return;
@@ -6544,9 +6538,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_V
 
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        goto is_var_return;
@@ -7379,9 +7371,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_U
 
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        goto is_var_return;
@@ -7402,9 +7392,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_U
 
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        goto is_var_return;
@@ -31010,9 +30998,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_CONS
 
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        goto is_var_return;
@@ -31033,9 +31019,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_CONS
 
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        goto is_var_return;
@@ -32123,9 +32107,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_VAR_
 
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        goto is_var_return;
@@ -32146,9 +32128,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_VAR_
 
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        goto is_var_return;
@@ -33344,9 +33324,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_UNUS
 
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        goto is_var_return;
@@ -33367,9 +33345,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_UNUS
 
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        goto is_var_return;
@@ -40317,9 +40293,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_TMPVAR_
 
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-                                               zval_ptr_dtor_nogc(free_op1);
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        goto is_var_return;
@@ -40340,9 +40314,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_TMPVAR_
 
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-                                               zval_ptr_dtor_nogc(free_op1);
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        goto is_var_return;
@@ -40912,9 +40884,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_TMPVAR_
 
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-                                               zval_ptr_dtor_nogc(free_op1);
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        goto is_var_return;
@@ -40935,9 +40905,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_TMPVAR_
 
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-                                               zval_ptr_dtor_nogc(free_op1);
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        goto is_var_return;
@@ -41322,9 +41290,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_TMPVAR_
 
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-                                               zval_ptr_dtor_nogc(free_op1);
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        goto is_var_return;
@@ -41345,9 +41311,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ISSET_ISEMPTY_VAR_SPEC_TMPVAR_
 
                                        /* check if static properties were destoyed */
                                        if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL)) {
-                                               zend_error(E_EXCEPTION | E_ERROR, "Access to undeclared static property: %s::$%s", ce->name->val, Z_STRVAL_P(varname));
-                                               zval_ptr_dtor_nogc(free_op1);
-                                               HANDLE_EXCEPTION();
+                                               value = NULL;
                                        }
 
                                        goto is_var_return;
Unnamed repository; edit this file 'description' to name the repository.