From 496a3f83138e807150f2ff06f5462f7f9ab519fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= <joao.abecasis@nokia.com>
Date: Mon, 13 Dec 2010 18:06:19 +0100
Subject: Don't rely on uninitialized data

When we fail to get file attributes, the file times are left in an
uninitialized state, which may lead to a crash. In particular, this was
showing up in QMessageBox's autotest, where the lastModified time is
being queried on a non-existing file.

Before the refactoring, we were returning a default constructed
QDateTime to queries about different file times, with this change we
will return the time corresponding to a default constructed FILETIME
object.

Reviewed-by: Shane Kearns
---
 src/corelib/io/qfilesystemengine_win.cpp |  3 +++
 tests/auto/qfileinfo/tst_qfileinfo.cpp   | 45 ++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp
index 39fce97..b7bded9 100644
--- a/src/corelib/io/qfilesystemengine_win.cpp
+++ b/src/corelib/io/qfilesystemengine_win.cpp
@@ -433,6 +433,9 @@ void QFileSystemEngine::clearWinStatData(QFileSystemMetaData &data)
 {
     data.size_ = 0;
     data.fileAttribute_ =  0;
+    data.creationTime_ = FILETIME();
+    data.lastAccessTime_ = FILETIME();
+    data.lastWriteTime_ = FILETIME();
 }
 
 bool QFileSystemEngine::isCaseSensitive()
diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index 0a61d55..4d9e80b 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -196,6 +196,8 @@ private slots:
     void owner();
 #endif
     void group();
+
+    void invalidState();
 };
 
 tst_QFileInfo::tst_QFileInfo()
@@ -1761,5 +1763,48 @@ void tst_QFileInfo::group()
     QCOMPARE(fi.group(), expected);
 }
 
+void tst_QFileInfo::invalidState()
+{
+    // Shouldn't crash;
+
+    {
+        QFileInfo info;
+        QCOMPARE(info.size(), qint64(0));
+        QVERIFY(!info.exists());
+
+        info.setCaching(false);
+
+        info.created();
+        info.lastRead();
+        info.lastModified();
+    }
+
+    {
+        QFileInfo info("");
+        QCOMPARE(info.size(), qint64(0));
+        QVERIFY(!info.exists());
+
+        info.setCaching(false);
+
+        info.created();
+        info.lastRead();
+        info.lastModified();
+    }
+
+    {
+        QFileInfo info("file-doesn't-really-exist.txt");
+        QCOMPARE(info.size(), qint64(0));
+        QVERIFY(!info.exists());
+
+        info.setCaching(false);
+
+        info.created();
+        info.lastRead();
+        info.lastModified();
+    }
+
+    QVERIFY(true);
+}
+
 QTEST_MAIN(tst_QFileInfo)
 #include "tst_qfileinfo.moc"
-- 
cgit v0.12