1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFileDialog: use ::sysconf() to get initial passwd struct buffer size

Browse Source 
Use QVLA since buf is no techincally a var-length-array.

Change-Id: I334cf2d1f9ef162495ed223a8e48e1b8e674afc0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
This commit is contained in:
Ahmad Samir 2023-05-29 21:54:22 +03:00
parent 79710abf95
commit ef53352dbc
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/widgets/dialogs/qfiledialog.cpp
View File

@ -1109,13 +1109,15 @@ static QString homeDirFromPasswdEntry(const QString &path, const QByteArray &use
#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_WASM) #if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_WASM)
passwd pw; passwd pw;
passwd *tmpPw; passwd *tmpPw;
char buf[200]; long bufSize = ::sysconf(_SC_GETPW_R_SIZE_MAX);
const int bufSize = sizeof(buf); if (bufSize == -1)
bufSize = 1024;
QVarLengthArray<char, 1024> buf(bufSize);
int err = 0; int err = 0;
# if defined(Q_OS_SOLARIS) && (_POSIX_C_SOURCE - 0 < 199506L) # if defined(Q_OS_SOLARIS) && (_POSIX_C_SOURCE - 0 < 199506L)
tmpPw = getpwnam_r(userName.constData(), &pw, buf, bufSize); tmpPw = getpwnam_r(userName.constData(), &pw, buf.data(), buf.size());
# else # else
err = getpwnam_r(userName.constData(), &pw, buf, bufSize, &tmpPw); err = getpwnam_r(userName.constData(), &pw, buf.data(), buf.size(), &tmpPw);
# endif # endif
if (err || !tmpPw) if (err || !tmpPw)
return path; return path;