diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-08-24 09:36:20 +0200 |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-08-24 09:36:20 +0200 |
| commit | 898cba2245b6fafa3820b44203442fedd9f7ed73 (patch) | |
| tree | c7545af2a15396c7c5d79612d7073de9b4274d43 /src/corelib/io/qresource.cpp | |
| parent | 6dade01b24f3fd314cb6ec9c2979348e78740a52 (diff) | |
| parent | 028655065de7f989a35b63bcab583767aba9c048 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/corelib/io/qresource.cpp')
| -rw-r--r-- | src/corelib/io/qresource.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index ab4a7b746..ff1a31f58 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -1485,11 +1485,7 @@ uchar *QResourceFileEnginePrivate::map(qint64 offset, qint64 size, QFile::Memory { Q_Q(QResourceFileEngine); Q_UNUSED(flags); - if (!resource.isValid() - || offset < 0 - || size < 0 - || offset + size > resource.size() - || (size == 0)) { + if (offset < 0 || size <= 0 || !resource.isValid() || offset + size > resource.size()) { q->setError(QFile::UnspecifiedError, QString()); return 0; } |