diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-07-12 18:41:35 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-08-09 05:19:23 +0000 |
| commit | 9312ec54dbf8031f4d23c6fc400c1ca27e3f9d1f (patch) | |
| tree | 09e4443fd5b5762ab1499404d9598c13fe7fc465 /src/corelib/io/qfile.cpp | |
| parent | 284fff12172095a899303d9b4fc06c7bf502c93d (diff) | |
Fix QAbstractFileEngine::clone misuse
QFile::copy was assuming that the target file was native and therefore
it could simply take the file descriptor to clone. While that was not
currently a problem, in theory it could be as we do have one writeable
file engine besides QFSFileEngine (QWinRTFileEngine).
By refactoring to take the parameter as a QAbstractFileEngine, we can
ensure that the target file is a native file.
Change-Id: Ib7a1737987bf4c4a8c51fffd14d0c048fd509025
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/io/qfile.cpp')
| -rw-r--r-- | src/corelib/io/qfile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp index 5b487a1339..d32c2ed9fd 100644 --- a/src/corelib/io/qfile.cpp +++ b/src/corelib/io/qfile.cpp @@ -804,7 +804,7 @@ QFile::copy(const QString &newName) close(); d->setError(QFile::CopyError, tr("Cannot open for output")); } else { - if (!out.d_func()->engine()->clone(d->engine()->handle())) { + if (!d->engine()->cloneTo(out.d_func()->engine())) { char block[4096]; qint64 totalRead = 0; while (!atEnd()) { |