mirror of
https://git.freebsd.org/ports.git
synced 2025-06-24 06:00:30 -04:00
69f24b93f5
For the most part this is just to track upstream for FreeBSD. In particular 10.2.0 introduced a regression whereby UFS support was dropped. The fix was backported to the FreeBSD port of 10.2.0 in lieu of waiting for 10.2.5 to be released. PR: 227124 Submitted by: John Wolfe <jwolfe@vmware.com>
37 lines
1.1 KiB
C
37 lines
1.1 KiB
C
--- services/plugins/vix/vixTools.c.orig 2018-03-30 18:44:35 UTC
|
|
+++ services/plugins/vix/vixTools.c
|
|
@@ -52,6 +52,7 @@
|
|
#include <stdarg.h>
|
|
#include <fcntl.h>
|
|
#include <errno.h>
|
|
+#include <limits.h>
|
|
|
|
#ifdef _WIN32
|
|
#include <WTypes.h>
|
|
@@ -10133,7 +10134,7 @@ abort:
|
|
struct passwd pwd;
|
|
struct passwd *ppwd = &pwd;
|
|
char *buffer = NULL; // a pool of memory for Posix_Getpwnam_r() to use.
|
|
- size_t bufferSize;
|
|
+ long bufferSize;
|
|
|
|
/*
|
|
* For POSIX systems, look up the uid of 'username', and compare
|
|
@@ -10146,9 +10147,15 @@ abort:
|
|
* Multiply by 4 to compensate for the conversion to UTF-8 by
|
|
* the Posix_Getpwnam_r() wrapper.
|
|
*/
|
|
- bufferSize = (size_t) sysconf(_SC_GETPW_R_SIZE_MAX) * 4;
|
|
+ errno = 0;
|
|
+ bufferSize = sysconf(_SC_GETPW_R_SIZE_MAX);
|
|
+ if ((errno != 0) || (bufferSize <= 0)) {
|
|
+ bufferSize = 16 * 1024; // Unlimited; pick something reasonable
|
|
+ }
|
|
|
|
- buffer = Util_SafeMalloc(bufferSize);
|
|
+ bufferSize *= 4;
|
|
+
|
|
+ buffer = Util_SafeMalloc((size_t)bufferSize);
|
|
|
|
if (Posix_Getpwnam_r(username, &pwd, buffer, bufferSize, &ppwd) != 0 ||
|
|
NULL == ppwd) {
|