diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2010-08-09 11:57:14 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2010-08-09 11:57:14 (GMT) |
| commit | 662f87ad52ea75229ce18b19983890425cc45298 (patch) | |
| tree | 67b1764083e54f017e0d318c63c152af40307ad9 /src/corelib | |
| parent | eea84818e98af917d3cf2bf04ea17a416ef9d55e (diff) | |
| parent | 7829343dc9e12befd6c471cc72d00139bad5d42b (diff) | |
| download | Qt-662f87ad52ea75229ce18b19983890425cc45298.zip Qt-662f87ad52ea75229ce18b19983890425cc45298.tar.gz Qt-662f87ad52ea75229ce18b19983890425cc45298.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qfsfileengine_win.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index 21930e1..35fa04b 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -1958,6 +1958,10 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + // Since this is a special case, we check if the return value was NULL and if so + // we change it to INVALID_HANDLE_VALUE to follow the logic inside this function. + if(0 == handle) + handle = INVALID_HANDLE_VALUE; #endif if (handle == INVALID_HANDLE_VALUE) { |