1 --- php-5.3.0/main/php_ini.c.org 2009-07-06 17:32:30.309904482 +0200
2 +++ php-5.3.0/main/php_ini.c 2009-07-06 17:36:45.529879052 +0200
4 zend_llist scanned_ini_list;
5 zend_llist_element *element;
7 + const char *fmt = "%s:" PHP_CONFIG_FILE_PATH "/%s.d";
9 /* List of found ini files */
10 zend_llist_init(&scanned_ini_list, sizeof(char *), (llist_dtor_func_t) free_estring, 1);
12 /* Split by paths_separator and load ini-files from all paths */
13 - path_copy = estrdup(php_ini_scanned_path);
14 + path_copy = emalloc(strlen(php_ini_scanned_path) + strlen(fmt) + strlen(sapi_module.name));
15 + sprintf(path_copy, fmt, php_ini_scanned_path, sapi_module.name);
16 ini_path = php_strtok_r(path_copy, paths_separator, &last);
18 while (ini_path != NULL) {