feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Add checks against deleting files

Browse Source 
There were reported cases in which the documents folder was deleted.
Adding checks to ensure only temporary files are deleted or single examples.

Task-number: QDS-11545
Change-Id: I93257ca6a9898ea6844cbc4125daef28ea57a7e7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2023-12-18 11:39:55 +01:00
committed by Tim Jenssen
parent 671426f4a0
commit 0034ade5d6
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qmldesigner/utils/fileextractor.cpp
View File

@@ -216,14 +216,16 @@ void FileExtractor::extract()
m_targetFolder = m_targetPath.toString() + "/" + m_archiveName; m_targetFolder = m_targetPath.toString() + "/" + m_archiveName;
// If the target directory already exists, remove it and its content // If the target directory already exists, remove it and its content
QDir targetDir(m_targetFolder);
if (targetDir.exists() && m_clearTargetPathContents)
targetDir.removeRecursively();
if (m_alwaysCreateDir) { QTC_ASSERT(!m_targetPath.isEmpty(), return );
// Create a new directory to generate a proper creation date
targetDir.mkdir(m_targetFolder); FilePath targetFilePath = FilePath::fromUserInput(m_targetFolder);
} if (targetFilePath.exists() && m_clearTargetPathContents)
targetFilePath.removeRecursively();
// Create a new directory to generate a proper creation date
if (m_alwaysCreateDir)
targetFilePath.createDir();
const auto sourceAndCommand = Unarchiver::sourceAndCommand(m_sourceFile); const auto sourceAndCommand = Unarchiver::sourceAndCommand(m_sourceFile);
QTC_ASSERT(sourceAndCommand, return); QTC_ASSERT(sourceAndCommand, return);
@@ -261,6 +263,8 @@ void FileExtractor::extract()
void QmlDesigner::FileExtractor::removeTempTargetPath() void QmlDesigner::FileExtractor::removeTempTargetPath()
{ {
if (m_isTempTargetPath && m_targetPath.exists()) { if (m_isTempTargetPath && m_targetPath.exists()) {
QTC_ASSERT(m_targetPath.toString().startsWith(QDir::tempPath()), qDebug() << m_targetPath;
return );
m_targetPath.removeRecursively(); m_targetPath.removeRecursively();
m_isTempTargetPath = false; m_isTempTargetPath = false;
} }