QFile::rename didn't always return false when method failed

The fallback implementation for rename would return true in some
situations where the move failed. Also the destination file might be
created and left there in these cases.

Task-number: 244500
Reviewed-by: mariusSO

1 files changed, 9 insertions, 3 deletions

diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp
index d8f08c9..986c6f5 100644
--- a/src/corelib/io/qfile.cpp
+++ b/src/corelib/io/qfile.cpp
@@ -731,10 +731,16 @@ QFile::rename(const QString &newName)
                 }
                 if (read == -1) {
                     d->setError(QFile::RenameError, in.errorString());
-                    return true;
+                    error = true;
+                }
+                if(!error) {
+                    if (!in.remove()) {
+                        d->setError(QFile::RenameError, tr("Cannot remove source file"));
+                        error = true;
+                    }
                 }
-                if(!error)
-                    in.remove();
+                if (error)
+                    out.remove();
                 return !error;
             }
         }