diff options
| author | Xinchen Hui <laruence@php.net> | 2015-02-27 12:01:05 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-02-27 12:01:05 +0800 |
| commit | d377cb620760bce7da9cfc3d2906eebd7ebb1cda (patch) | |
| tree | 8cb6ca99ff0fb662e25453d32468162df7347831 | |
| parent | 4b83d02b4b5d09c5f5aecc739fdd76f835561fe3 (diff) | |
| parent | ebfc49aa918044e65b3704933224a807d98b4e68 (diff) | |
| download | php-git-d377cb620760bce7da9cfc3d2906eebd7ebb1cda.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -rw-r--r-- | main/main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/main/main.c b/main/main.c index 7787ac6488..e39f36e69e 100644 --- a/main/main.c +++ b/main/main.c @@ -1317,6 +1317,11 @@ PHPAPI char *php_get_current_user(TSRMLS_D) return ""; } pwd = &_pw; + + if (retpwptr == NULL) { + efree(pwbuf); + return ""; + } #else if ((pwd=getpwuid(pstat->st_uid))==NULL) { return ""; |