- Nuke empty_string. It is a reminanent from the time where RETURN_FALSE()

  used to return "" and not bool(false). It's not worth keeping it because
  STR_FREE() and zval_dtor() always have to check for it and it slows down
  the general case. In addition, it seems that empty_string has been abused
  quite a lot, and was used not only for setting zval's but generally in
  PHP code instead of "", which wasn't the intention. Last but not least,
  nuking empty_string should improve stability as I doubt every place
  correctly checked if they are not mistakenly erealloc()'ing it or
  calling efree() on it.
  NOTE: Some code is probably broken. Each extension maintainer should
  check and see that my changes are OK. Also, I haven't had time to touch
  PECL yet. Will try and do it tomorrow.

1 files changed, 2 insertions, 2 deletions

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);