mirror of
https://github.com/php/php-src.git
synced 2024-09-22 18:37:25 +00:00
Merge branch 'PHP-5.5' into PHP-5.6
This commit is contained in:
commit
578903578c
@ -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 "";
|
||||
|
Loading…
Reference in New Issue
Block a user