diff options
| author | Xinchen Hui <laruence@php.net> | 2015-02-27 12:03:00 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-02-27 12:03:00 +0800 |
| commit | 578903578c719e0d197e44a3701043fa07d93df1 (patch) | |
| tree | 29ab10346ce95fdd5a19b68fe3f33f998a4ee66c | |
| parent | 414bc8ee03879853f7ed71110c9e901df67b30f3 (diff) | |
| parent | 4eb830b212b3f0c53ed208723520e77a26b13e2b (diff) | |
| download | php-git-578903578c719e0d197e44a3701043fa07d93df1.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -rw-r--r-- | main/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/main/main.c b/main/main.c index e39f36e69e..d073b850a5 100644 --- a/main/main.c +++ b/main/main.c @@ -1316,12 +1316,11 @@ PHPAPI char *php_get_current_user(TSRMLS_D) efree(pwbuf); return ""; } - pwd = &_pw; - if (retpwptr == NULL) { efree(pwbuf); return ""; } + pwd = &_pw; #else if ((pwd=getpwuid(pstat->st_uid))==NULL) { return ""; |