diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-19 17:32:00 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-19 17:32:21 +0200 |
| commit | 525d8a8bfae487bd6890c6bf3688883ef804d82e (patch) | |
| tree | 75319404aeefd21565941b583075c41bb42c5275 | |
| parent | 2f56b0018e2963a456e1a313ed8ea1de5cf74349 (diff) | |
| parent | 6aff9a50cae40582d2571e7aa6f336d5c6a99547 (diff) | |
| download | php-git-525d8a8bfae487bd6890c6bf3688883ef804d82e.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #79570
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/posix/posix.c | 18 |
2 files changed, 20 insertions, 0 deletions
@@ -48,6 +48,8 @@ PHP NEWS - Standard: . Fixed bug #74267 (segfault with streams and invalid data). (cmb) + . Fixed bug #79579 (ZTS build of PHP 7.3.17 doesn't handle ERANGE for + posix_getgrgid and others). (Böszörményi Zoltán) 11 Jun 2020, PHP 7.4.7 diff --git a/ext/posix/posix.c b/ext/posix/posix.c index 98dae1ca3c..948069a6b4 100644 --- a/ext/posix/posix.c +++ b/ext/posix/posix.c @@ -1148,8 +1148,14 @@ PHP_FUNCTION(posix_getgrgid) grbuf = emalloc(grbuflen); +try_again: ret = getgrgid_r(gid, &_g, grbuf, grbuflen, &retgrptr); if (ret || retgrptr == NULL) { + if (errno == ERANGE) { + grbuflen *= 2; + grbuf = erealloc(grbuf, grbuflen); + goto try_again; + } POSIX_G(last_error) = ret; efree(grbuf); RETURN_FALSE; @@ -1217,7 +1223,13 @@ PHP_FUNCTION(posix_getpwnam) buf = emalloc(buflen); pw = &pwbuf; +try_again: if (getpwnam_r(name, pw, buf, buflen, &pw) || pw == NULL) { + if (errno == ERANGE) { + buflen *= 2; + buf = erealloc(buf, buflen); + goto try_again; + } efree(buf); POSIX_G(last_error) = errno; RETURN_FALSE; @@ -1266,8 +1278,14 @@ PHP_FUNCTION(posix_getpwuid) } pwbuf = emalloc(pwbuflen); +try_again: ret = getpwuid_r(uid, &_pw, pwbuf, pwbuflen, &retpwptr); if (ret || retpwptr == NULL) { + if (errno == ERANGE) { + pwbuflen *= 2; + pwbuf = erealloc(pwbuf, pwbuflen); + goto try_again; + } POSIX_G(last_error) = ret; efree(pwbuf); RETURN_FALSE; |