summaryrefslogtreecommitdiff
path: root/Zend/zend_ini_parser.y
diff options
context:
space:
mode:
authorWez Furlong <wez@php.net>2004-01-13 17:00:10 +0000
committerWez Furlong <wez@php.net>2004-01-13 17:00:10 +0000
commitd4deb460bdbb77b3c75ce7a6a328e3070e2aa527 (patch)
tree851e169015296aeeb63442300a47c4070944ab88 /Zend/zend_ini_parser.y
parentc205153a0a91a6280eeba121fc33f794d37f98a6 (diff)
downloadphp-git-d4deb460bdbb77b3c75ce7a6a328e3070e2aa527.tar.gz
Don't treat strings containing : as potential constant names in
the .ini parser. This fixes Bug #26893
Diffstat (limited to 'Zend/zend_ini_parser.y')
-rw-r--r--Zend/zend_ini_parser.y3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y
index cd3fb5ee32..1d90e34f5f 100644
--- a/Zend/zend_ini_parser.y
+++ b/Zend/zend_ini_parser.y
@@ -98,7 +98,8 @@ void zend_ini_get_constant(zval *result, zval *name)
zval z_constant;
TSRMLS_FETCH();
- if (zend_get_constant(name->value.str.val, name->value.str.len, &z_constant TSRMLS_CC)) {
+ if (!memchr(name->value.str.val, ':', name->value.str.len)
+ && zend_get_constant(name->value.str.val, name->value.str.len, &z_constant TSRMLS_CC)) {
/* z_constant is emalloc()'d */
convert_to_string(&z_constant);
result->value.str.val = zend_strndup(z_constant.value.str.val, z_constant.value.str.len);