]> granicus.if.org Git - php/commitdiff
Drop dead code from update_constant
authorNikita Popov <nikic@php.net>
Fri, 29 Apr 2016 20:15:38 +0000 (22:15 +0200)
committerNikita Popov <nikic@php.net>
Fri, 29 Apr 2016 20:15:38 +0000 (22:15 +0200)
Zend/zend_execute_API.c

index 2acf29c2ce99bbab1ce915bb48e8065d7776e2ee..794c7f0fc95b4daf3254169eeff152604c6f23e3 100644 (file)
@@ -608,21 +608,8 @@ ZEND_API int zval_update_constant_ex(zval *p, zend_class_entry *scope) /* {{{ */
                                                Z_TYPE_FLAGS_P(p) = IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE;
                                        }
                                }
-                               if (actual[0] == '\\') {
-                                       if (inline_change) {
-                                               memmove(Z_STRVAL_P(p), Z_STRVAL_P(p)+1, Z_STRLEN_P(p));
-                                               --Z_STRLEN_P(p);
-                                       } else {
-                                               ++actual;
-                                       }
-                                       --actual_len;
-                               }
                                if ((Z_CONST_FLAGS_P(p) & IS_CONSTANT_UNQUALIFIED) == 0) {
-                                       if (ZSTR_VAL(save)[0] == '\\') {
-                                               zend_throw_error(NULL, "Undefined constant '%s'", ZSTR_VAL(save) + 1);
-                                       } else {
-                                               zend_throw_error(NULL, "Undefined constant '%s'", ZSTR_VAL(save));
-                                       }
+                                       zend_throw_error(NULL, "Undefined constant '%s'", ZSTR_VAL(save));
                                        if (inline_change) {
                                                zend_string_release(save);
                                        }