summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-11-23 11:02:50 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-11-23 11:02:56 (GMT)
commit9619f5e27cbed9b45188112c934733e9f069b8ca (patch)
tree3425eb3c78dd5ea13df579d4ee34dc4c2801ffd4 /src/corelib
parent8759a330bd13174d79087fd16e4529ac44e4516f (diff)
parent01fec63b7b8f8cae94f92fca1d806fe8c6156299 (diff)
downloadQt-9619f5e27cbed9b45188112c934733e9f069b8ca.zip
Qt-9619f5e27cbed9b45188112c934733e9f069b8ca.tar.gz
Qt-9619f5e27cbed9b45188112c934733e9f069b8ca.tar.bz2
Merge commit '01fec63b7b8f8cae94f92fca1d806fe8c6156299' of oslo-staging-1 into 4.6
Diffstat (limited to 'src/corelib')
-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;