diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2018-06-05 23:42:52 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2018-06-05 23:42:52 +0000 |
| commit | 96455275ddb5a2feed979afd277419d108c836b1 (patch) | |
| tree | fe5eaed7fad8d19c8a588cc375ce3b52fbb96df4 /user/php7/pwbuflen.patch | |
| parent | 6021da9d6a1217b3d891e48a424732f3f7fcd46c (diff) | |
| parent | 8be79780a4d67231c74bfe1f57648a16aea85687 (diff) | |
| download | packages-96455275ddb5a2feed979afd277419d108c836b1.tar.gz packages-96455275ddb5a2feed979afd277419d108c836b1.tar.bz2 packages-96455275ddb5a2feed979afd277419d108c836b1.tar.xz packages-96455275ddb5a2feed979afd277419d108c836b1.zip | |
Merge branch 'php7' into 'master'
user/{libzip,php7}: new packages
See merge request !38
Diffstat (limited to 'user/php7/pwbuflen.patch')
| -rw-r--r-- | user/php7/pwbuflen.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/user/php7/pwbuflen.patch b/user/php7/pwbuflen.patch new file mode 100644 index 000000000..7d2685b55 --- /dev/null +++ b/user/php7/pwbuflen.patch @@ -0,0 +1,15 @@ +sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on musl and 1024 on glibc. + +--- php-7.2.6/main/main.c 2018-06-04 23:30:18.790089810 -0400 ++++ php-7.2.6/main/main.c 2018-06-04 23:30:14.660089806 -0400 +@@ -1315,7 +1315,9 @@ + int pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX); + char *pwbuf; + +- if (pwbuflen < 1) { ++ if (pwbuflen == -1) { ++ pwbuflen = 1024; ++ } else if (pwbuflen < 1) { + return ""; + } + pwbuf = emalloc(pwbuflen); |