2022-05-14 17:41:02 +08:00
|
|
|
From: Pino Toscano <toscano.pino@tiscali.it>
|
|
|
|
|
Date: Sat, 14 May 2022 17:41:01 +0800
|
|
|
|
|
Subject: Avoid unconditional PATH_MAX usage
|
|
|
|
|
|
|
|
|
|
Use a "safe" size in case PATH_MAX is not defined; in the end, this should not
|
|
|
|
|
be used, as a allocating realpath() will be used instead.
|
2022-04-25 22:03:04 +08:00
|
|
|
Forwarded: no
|
|
|
|
|
Last-Update: 2020-04-19
|
2022-05-14 17:41:02 +08:00
|
|
|
---
|
|
|
|
|
src/corelib/io/qfilesystemengine_unix.cpp | 4 ++++
|
|
|
|
|
1 file changed, 4 insertions(+)
|
2022-04-25 22:03:04 +08:00
|
|
|
|
2022-05-14 17:41:02 +08:00
|
|
|
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
|
|
|
|
|
index 3cbf032..2432171 100644
|
2022-04-25 22:03:04 +08:00
|
|
|
--- a/src/corelib/io/qfilesystemengine_unix.cpp
|
|
|
|
|
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
|
2022-05-14 17:41:02 +08:00
|
|
|
@@ -689,7 +689,11 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry,
|
2022-04-25 22:03:04 +08:00
|
|
|
Q_UNUSED(data);
|
|
|
|
|
return QFileSystemEntry(slowCanonicalized(absoluteName(entry).filePath()));
|
|
|
|
|
#else
|
|
|
|
|
+#ifdef PATH_MAX
|
|
|
|
|
char stack_result[PATH_MAX+1];
|
|
|
|
|
+#else
|
|
|
|
|
+ char stack_result[4096+1];
|
|
|
|
|
+#endif
|
|
|
|
|
char *resolved_name = nullptr;
|
|
|
|
|
# if defined(Q_OS_DARWIN) || defined(Q_OS_ANDROID)
|
|
|
|
|
// On some Android and macOS versions, realpath() will return a path even if
|
