diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_ini.c | 2 | ||||
| -rw-r--r-- | main/safe_mode.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index 5fb95c71d8..35542ef63d 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -170,7 +170,7 @@ PHPAPI void display_ini_entries(zend_module_entry *module) */ static void pvalue_config_destructor(zval *pvalue) { - if (Z_TYPE_P(pvalue) == IS_STRING && Z_STRVAL_P(pvalue) != empty_string) { + if (Z_TYPE_P(pvalue) == IS_STRING) { free(Z_STRVAL_P(pvalue)); } } diff --git a/main/safe_mode.c b/main/safe_mode.c index 9271610f9b..0412433b22 100644 --- a/main/safe_mode.c +++ b/main/safe_mode.c @@ -207,11 +207,11 @@ PHPAPI char *php_get_current_user() pstat = sapi_get_stat(TSRMLS_C); if (!pstat) { - return empty_string; + return ""; } if ((pwd=getpwuid(pstat->st_uid))==NULL) { - return empty_string; + return ""; } SG(request_info).current_user_length = strlen(pwd->pw_name); SG(request_info).current_user = estrndup(pwd->pw_name, SG(request_info).current_user_length); |