diff options
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 8e0b331b73..7ea34c5d6c 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -5149,7 +5149,27 @@ void zend_do_import(znode *ns_name, znode *new_name TSRMLS_DC) /* {{{ */ zend_error(E_COMPILE_ERROR, "Cannot use '%R' as import name", Z_TYPE_P(name), Z_UNIVAL_P(name)); } - if (zend_u_hash_exists(CG(class_table), Z_TYPE_P(name), lcname, lcname_len+1)) { + if (CG(current_namespace)) { + /* Prefix import name with current namespace name to avoid conflicts with classes */ + uint ns_name_len; + zstr ns_name = zend_u_str_case_fold(Z_TYPE_P(CG(current_namespace)), Z_UNIVAL_P(CG(current_namespace)), Z_UNILEN_P(CG(current_namespace)), 0, &ns_name_len); + + if (Z_TYPE_P(CG(current_namespace)) == IS_UNICODE) { + ns_name.u = eurealloc(ns_name.u, ns_name_len + 2 + lcname_len + 1); + ns_name.u[ns_name_len] = ':'; + ns_name.u[ns_name_len+1] = ':'; + memcpy(ns_name.u + ns_name_len + 2, lcname.u, UBYTES(lcname_len + 1)); + } else { + ns_name.s = erealloc(ns_name.s, ns_name_len + 2 + lcname_len + 1); + ns_name.s[ns_name_len] = ':'; + ns_name.s[ns_name_len+1] = ':'; + memcpy(ns_name.s + ns_name_len + 2, lcname.s, lcname_len + 1); + } + if (zend_u_hash_exists(CG(class_table), Z_TYPE_P(CG(current_namespace)), ns_name, ns_name_len + 2 + lcname_len + 1)) { + zend_error(E_COMPILE_ERROR, "Import name '%R' conflicts with defined class", Z_TYPE_P(name), Z_STRVAL_P(name)); + } + efree(ns_name.v); + } else if (zend_u_hash_exists(CG(class_table), Z_TYPE_P(name), lcname, lcname_len+1)) { zend_error(E_COMPILE_ERROR, "Import name '%R' conflicts with defined class", Z_TYPE_P(name), Z_UNIVAL_P(name)); } |