summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2014-05-29 00:39:02 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-04 12:25:02 +0200
commit523440a15f83dfda30e6bede02f83d76d8765647 (patch)
treeeca5001030ae941c6c6c6ee95777fcb4567e5dc2 /src/corelib/io
parent565ee701a0840998cd27589a62f9efd701ae863a (diff)
QSaveFile: error out in open when the file is a directory
Change-Id: Ifb1697fedf6dd28fe317282c8b4824f34ec61981 Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src/corelib/io')
-rw-r--r--src/corelib/io/qsavefile.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/io/qsavefile.cpp b/src/corelib/io/qsavefile.cpp
index 05d7687007..8be4125ef5 100644
--- a/src/corelib/io/qsavefile.cpp
+++ b/src/corelib/io/qsavefile.cpp
@@ -206,6 +206,12 @@ bool QSaveFile::open(OpenMode mode)
return false;
}
+ if (existingFile.isDir()) {
+ d->setError(QFileDevice::WriteError, QSaveFile::tr("Filename refers to a directory"));
+ d->writeError = QFileDevice::WriteError;
+ return false;
+ }
+
// Resolve symlinks. Don't use QFileInfo::canonicalFilePath so it still give the expected
// target even if the file does not exist
d->finalFileName = d->fileName;