diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2006-11-30 00:35:27 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2006-11-30 00:35:27 +0000 |
| commit | 24731d0ba928073386f73ee545a30e93d532f458 (patch) | |
| tree | c7cc80ff12d575d23d9496b1090c80a79eb4bd42 /ext | |
| parent | b9e264d4974249ff49ac82dad1caaac8578241cc (diff) | |
| download | php-git-24731d0ba928073386f73ee545a30e93d532f458.tar.gz | |
MFB: Thread safety fixed for *nix systems
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/posix/posix.c | 42 |
1 files changed, 37 insertions, 5 deletions
diff --git a/ext/posix/posix.c b/ext/posix/posix.c index a63da8bd9a..eedb7f72d2 100644 --- a/ext/posix/posix.c +++ b/ext/posix/posix.c @@ -827,17 +827,33 @@ PHP_FUNCTION(posix_getgrnam) PHP_FUNCTION(posix_getgrgid) { long gid; +#ifdef HAVE_GETGRGID_R + int ret; + struct group _g; + struct group *retgrptr; + int grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX); + char *grbuf = emalloc(grbuflen); +#endif struct group *g; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &gid) == FAILURE) { RETURN_FALSE; } - +#ifdef HAVE_GETGRGID_R + ret = getgrgid_r(gid, &_g, grbuf, grbuflen, &retgrptr); + if (ret) { + POSIX_G(last_error) = ret; + efree(grbuf); + RETURN_FALSE; + } + efree(grbuf); + g = &_g; +#else if (NULL == (g = getgrgid(gid))) { POSIX_G(last_error) = errno; RETURN_FALSE; } - +#endif array_init(return_value); if (!php_posix_group_to_array(g, return_value)) { @@ -895,17 +911,33 @@ PHP_FUNCTION(posix_getpwnam) PHP_FUNCTION(posix_getpwuid) { long uid; +#ifdef HAVE_GETPWUID_R + struct passwd _pw; + struct passwd *retpwptr = NULL; + int pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX); + char *pwbuf = emalloc(pwbuflen); + int ret; +#endif struct passwd *pw; - + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &uid) == FAILURE) { RETURN_FALSE; } - +#ifdef HAVE_GETPWUID_R + ret = getpwuid_r(uid, &_pw, pwbuf, pwbuflen, &retpwptr); + if (ret) { + POSIX_G(last_error) = ret; + efree(pwbuf); + RETURN_FALSE; + } + efree(pwbuf); + pw = &_pw; +#else if (NULL == (pw = getpwuid(uid))) { POSIX_G(last_error) = errno; RETURN_FALSE; } - +#endif array_init(return_value); if (!php_posix_passwd_to_array(pw, return_value)) { |