17 lines
895 B
Diff
17 lines
895 B
Diff
|
diff -aurp -x '*.o' qt-everywhere-opensource-src-4.6.2-old/src/corelib/io/qfsfileengine.cpp qt-everywhere-opensource-src-4.6.2/src/corelib/io/qfsfileengine.cpp
|
||
|
|
--- qt-everywhere-opensource-src-4.6.2-old/src/corelib/io/qfsfileengine.cpp 2010-02-11 16:55:23.000000000 +0100
|
||
|
|
+++ qt-everywhere-opensource-src-4.6.2/src/corelib/io/qfsfileengine.cpp 2010-02-19 14:57:06.000000000 +0100
|
||
|
|
@@ -145,10 +145,9 @@ QString QFSFileEnginePrivate::canonicali
|
||
|
|
#endif
|
||
|
|
// Mac OS X 10.5.x doesn't support the realpath(X,0) extenstion we use here.
|
||
|
|
#if defined(Q_OS_LINUX) || defined(Q_OS_SYMBIAN)
|
||
|
|
- char *ret = realpath(path.toLocal8Bit().constData(), (char*)0);
|
||
|
|
- if (ret) {
|
||
|
|
+ char ret[PATH_MAX];
|
||
|
|
+ if (realpath(path.toLocal8Bit().constData(), ret)) {
|
||
|
|
QString canonicalPath = QDir::cleanPath(QString::fromLocal8Bit(ret));
|
||
|
|
- free(ret);
|
||
|
|
return canonicalPath;
|
||
|
|
}
|
||
|
|
#endif
|