diff options
| author | Xinchen Hui <laruence@php.net> | 2015-02-27 12:03:04 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-02-27 12:03:04 +0800 |
| commit | 8f5676f73e57345b61447a27bc493b1b8f95ab5b (patch) | |
| tree | 64de7fff3bd1ffd3f15049d15972af067d635769 | |
| parent | b0e95e1e3535e4f3cf815aacaf507a58fac78528 (diff) | |
| parent | 578903578c719e0d197e44a3701043fa07d93df1 (diff) | |
| download | php-git-8f5676f73e57345b61447a27bc493b1b8f95ab5b.tar.gz | |
Merge branch '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 31e756fa6c..f74190cf06 100644 --- a/main/main.c +++ b/main/main.c @@ -1301,12 +1301,11 @@ PHPAPI char *php_get_current_user(void) efree(pwbuf); return ""; } - pwd = &_pw; - if (retpwptr == NULL) { efree(pwbuf); return ""; } + pwd = &_pw; #else if ((pwd=getpwuid(pstat->st_uid))==NULL) { return ""; |