summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qfsfileengine_unix.cpp
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-11-23 11:41:16 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-11-23 11:41:22 (GMT)
commitd08fc6843e58c63f1c101462bb2e30166a5dbde9 (patch)
tree29e68fe1fc72a0931f13d67587b9cfda98e48858 /src/corelib/io/qfsfileengine_unix.cpp
parentb4dbbd30c8092a81984cca30248db087353fe66e (diff)
parent4112771f56e827d1d8fbde0995ebf5b0242c01a8 (diff)
downloadQt-d08fc6843e58c63f1c101462bb2e30166a5dbde9.zip
Qt-d08fc6843e58c63f1c101462bb2e30166a5dbde9.tar.gz
Qt-d08fc6843e58c63f1c101462bb2e30166a5dbde9.tar.bz2
Merge 'upstream/4.6' into oslo-staging-2/4.6
Diffstat (limited to 'src/corelib/io/qfsfileengine_unix.cpp')
-rw-r--r--src/corelib/io/qfsfileengine_unix.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 05e6fab..35737b3 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -1254,7 +1254,7 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFla
// undefined behavior. Otherwise, let mmap have its say.
if (doStat()
&& (QT_OFF_T(size) > st.st_size - QT_OFF_T(offset)))
- return 0;
+ qWarning("QFSFileEngine::map: Mapping a file beyond its size is not portable");
int access = 0;
if (openMode & QIODevice::ReadOnly) access |= PROT_READ;