cvs: ZendEngine2 / zend_ini_parser.y

wez Tue Jan 13 12:00:10 2004 EDT Modified files: /ZendEngine2 zend_ini_parser.y Log: Don't treat strings containing : as potential constant names in the .ini parser. This fixes Bug #26893 Index: ZendEngine2/zend_ini_parser.y diff -u ZendEngine2/zend_ini_parser.y:1.28 ZendEngine2/zend_ini_parser.y:1.29 --- ZendEngine2/zend_ini_parser.y:1.28 Thu Jan 8 03:23:23 2004 +++ ZendEngine2/zend_ini_parser.y Tue Jan 13 12:00:10 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_ini_parser.y,v 1.28 2004/01/08 08:23:23 andi Exp $ */ +/* $Id: zend_ini_parser.y,v 1.29 2004/01/13 17:00:10 wez Exp $ */ #define DEBUG_CFG_PARSER 0 #include "zend.h" @@ -98,7 +98,8 @@ 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);