php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-15 03:51:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert define() fix, it needs further review

Browse Source
This commit is contained in:
Ilia Alshanetsky
2008-10-22 23:28:34 +00:00
parent 5c50be3674
commit 8a106deb24
1 changed files with 1 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Zend/zend_builtin_functions.c
View File

@@ -26,7 +26,6 @@
#include "zend_ini.h"
#include "zend_exceptions.h"
#include "zend_extensions.h"
#include <ctype.h>
#undef ZEND_TEST_EXCEPTIONS
@@ -718,7 +717,7 @@ ZEND_FUNCTION(error_reporting)
Define a new constant */
ZEND_FUNCTION(define)
{
char *name, *p;
char *name;
int name_len;
zval *val;
zval *val_free = NULL;
@@ -730,40 +729,6 @@ ZEND_FUNCTION(define)
return;
}
/* check if class constant */
if ((p = memchr(name, ':', name_len))) {
char *s = name;
zend_class_entry **ce;
if (*(p + 1) != ':') { /* invalid constant specifier */
RETURN_FALSE;
} else if ((p + 2) >= (name + name_len)) { /* constant name length < 1 */
zend_error(E_WARNING, "Constants name cannot be empty");
RETURN_FALSE;
} else if (zend_lookup_class(s, (p - s), &ce TSRMLS_CC) != SUCCESS) { /* invalid class name */
zend_error(E_WARNING, "Class does not exists");
RETURN_FALSE;
} else { /* check of constant name contains invalid chars */
int ok = 1;
p += 2; /* move beyond :: to 1st char of constant's name */
if (!isalpha(*p) && *p != '_') {
ok = 0;
}
while (ok && *++p) {
if (!isalnum(*p) && *p != '_') {
ok = 0;
break;
}
}
if (!ok) {
RETURN_FALSE;
}
}
}
if(non_cs) {
case_sensitive = 0;
}