Attachment #218596 for bug #250185

View | Details | Raw Unified | Return to bug 250185
Collapse All | Expand All

Lines 1085-1090 Link Here

(-)php-7.4.10/ext/posix/posix.c (+12 lines)
1085		1085
1086	#if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX)	1086	#if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX)
1087	buflen = sysconf(_SC_GETGR_R_SIZE_MAX);	1087	buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
		1088	#if defined(__FreeBSD__) && defined(_SC_PAGESIZE)
		1089	if (buflen < 1) buflen = sysconf(_SC_PAGESIZE);
		1090	#endif
1088	if (buflen < 1) {	1091	if (buflen < 1) {
1089	RETURN_FALSE;	1092	RETURN_FALSE;
1090	}	1093	}
Lines 1142-1147 Link Here
1142	#if defined(ZTS) && defined(HAVE_GETGRGID_R) && defined(_SC_GETGR_R_SIZE_MAX)	1145	#if defined(ZTS) && defined(HAVE_GETGRGID_R) && defined(_SC_GETGR_R_SIZE_MAX)
1143		1146
1144	grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);	1147	grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
		1148	#if defined(__FreeBSD__) && defined(_SC_PAGESIZE)
		1149	if (grbuflen < 1) grbuflen = sysconf(_SC_PAGESIZE);
		1150	#endif
1145	if (grbuflen < 1) {	1151	if (grbuflen < 1) {
1146	RETURN_FALSE;	1152	RETURN_FALSE;
1147	}	1153	}
Lines 1217-1222 Link Here
1217		1223
1218	#if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R)	1224	#if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R)
1219	buflen = sysconf(_SC_GETPW_R_SIZE_MAX);	1225	buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
		1226	#if defined(__FreeBSD__) && defined(_SC_PAGESIZE)
		1227	if (buflen < 1) buflen = sysconf(_SC_PAGESIZE);
		1228	#endif
1220	if (buflen < 1) {	1229	if (buflen < 1) {
1221	RETURN_FALSE;	1230	RETURN_FALSE;
1222	}	1231	}
Lines 1273-1278 Link Here
1273		1282
1274	#if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWUID_R)	1283	#if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWUID_R)
1275	pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);	1284	pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
		1285	#if defined(__FreeBSD__) && defined(_SC_PAGESIZE)
		1286	if (pwbuflen < 1) pwbuflen = sysconf(_SC_PAGESIZE);
		1287	#endif
1276	if (pwbuflen < 1) {	1288	if (pwbuflen < 1) {
1277	RETURN_FALSE;	1289	RETURN_FALSE;
1278	}	1290	}

Lines 303-308 Link Here

(-)php-7.4.10/ext/standard/filestat.c (+6 lines)
303	struct group gr;	303	struct group gr;
304	struct group *retgrptr;	304	struct group *retgrptr;
305	long grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);	305	long grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
		306	#if defined(__FreeBSD__) && defined(_SC_PAGESIZE)
		307	if (grbuflen < 1) grbuflen = sysconf(_SC_PAGESIZE);
		308	#endif
306	char *grbuf;	309	char *grbuf;
307		310
308	if (grbuflen < 1) {	311	if (grbuflen < 1) {
Lines 439-444 Link Here
439	struct passwd pw;	442	struct passwd pw;
440	struct passwd *retpwptr = NULL;	443	struct passwd *retpwptr = NULL;
441	long pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);	444	long pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
		445	#if defined(__FreeBSD__) && defined(_SC_PAGESIZE)
		446	if (pwbuflen < 1) pwbuflen = sysconf(_SC_PAGESIZE);
		447	#endif
442	char *pwbuf;	448	char *pwbuf;
443		449
444	if (pwbuflen < 1) {	450	if (pwbuflen < 1) {

Lines 367-372 Link Here

(-)php-7.4.10/main/fopen_wrappers.c (+3 lines)
367	#if defined(ZTS) && defined(HAVE_GETPWNAM_R) && defined(_SC_GETPW_R_SIZE_MAX)	367	#if defined(ZTS) && defined(HAVE_GETPWNAM_R) && defined(_SC_GETPW_R_SIZE_MAX)
368	struct passwd pwstruc;	368	struct passwd pwstruc;
369	long pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);	369	long pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
		370	#if defined(__FreeBSD__) && defined(_SC_PAGESIZE)
		371	if (pwbuflen < 1) pwbuflen = sysconf(_SC_PAGESIZE);
		372	#endif
370	char *pwbuf;	373	char *pwbuf;
371		374
372	if (pwbuflen < 1) {	375	if (pwbuflen < 1) {

Lines 1487-1492 Link Here

(-)php-7.4.10/main/main.c (+3 lines)
1487	struct passwd _pw;	1487	struct passwd _pw;
1488	struct passwd *retpwptr = NULL;	1488	struct passwd *retpwptr = NULL;
1489	int pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);	1489	int pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
		1490	#if defined(__FreeBSD__) && defined(_SC_PAGESIZE)
		1491	if (pwbuflen < 1) pwbuflen = sysconf(_SC_PAGESIZE);
		1492	#endif
1490	char *pwbuf;	1493	char *pwbuf;
1491		1494
1492	if (pwbuflen < 1) {	1495	if (pwbuflen < 1) {

Return to bug 250185