aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2017-09-01 16:35:56 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2017-09-01 15:15:14 +0000
commit7d85fed02c14d87fbea8a2573f947d2a1ce940a8 (patch)
tree2e76594c413396ccf30a85f542d060c918feaf91
parent9077f10d46909259effab143dc3d0e448e19ee8a (diff)
TextFile: Always destroy QTextStream before QFile
QTextStream's destructor tries to write unwritten data to its QIODevice. Make sure that we destroy QFile after QTextStream to avoid crashes. Change-Id: I0cf7a0d642b27ba611d431ed036a43a2988b9d2f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--src/lib/corelib/jsextensions/textfile.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/corelib/jsextensions/textfile.cpp b/src/lib/corelib/jsextensions/textfile.cpp
index 6db3c2fb5..d6ea6afaf 100644
--- a/src/lib/corelib/jsextensions/textfile.cpp
+++ b/src/lib/corelib/jsextensions/textfile.cpp
@@ -168,11 +168,11 @@ void TextFile::close()
{
if (checkForClosed())
return;
+ delete m_stream;
+ m_stream = 0;
m_file->close();
delete m_file;
m_file = 0;
- delete m_stream;
- m_stream = 0;
}
void TextFile::setCodec(const QString &codec)