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

Docker: Fix isValidMountInfo

Browse Source 
Improves checking if a requested mount is actually valid.

Change-Id: I37638d26ddd46776e6375481cf1d73ed0ad24210
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2022-10-14 09:59:04 +02:00
parent 0b40e4b032
commit 9aa1d56f56
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/docker/dockerdevice.cpp
View File

@@ -542,8 +542,18 @@ QStringList toMountArg(const DockerDevicePrivate::TemporaryMountInfo &mi)
bool isValidMountInfo(const DockerDevicePrivate::TemporaryMountInfo &mi) bool isValidMountInfo(const DockerDevicePrivate::TemporaryMountInfo &mi)
{ {
return !mi.path.isEmpty() && !mi.containerPath.isEmpty() && mi.path.isAbsolutePath() if (mi.path.needsDevice())
&& mi.containerPath.isAbsolutePath(); return false;
if (mi.path.isEmpty() || mi.containerPath.isEmpty())
return false;
if (!mi.path.isAbsolutePath() || !mi.containerPath.isAbsolutePath())
return false;
if (!mi.path.exists())
return false;
return true;
} }
QStringList DockerDevicePrivate::createMountArgs() const QStringList DockerDevicePrivate::createMountArgs() const
@@ -817,6 +827,9 @@ bool DockerDevice::handlesFile(const FilePath &filePath) const
bool DockerDevice::ensureReachable(const FilePath &other) const bool DockerDevice::ensureReachable(const FilePath &other) const
{ {
if (other.isSameDevice(rootPath()))
return true;
if (other.needsDevice()) if (other.needsDevice())
return false; return false;
@@ -1087,8 +1100,12 @@ bool DockerDevicePrivate::addTemporaryMount(const FilePath &path, const FilePath
if (alreadyAdded) if (alreadyAdded)
return false; return false;
const TemporaryMountInfo newMount{path, containerPath};
QTC_ASSERT(isValidMountInfo(newMount), return false);
qCDebug(dockerDeviceLog) << "Adding temporary mount:" << path; qCDebug(dockerDeviceLog) << "Adding temporary mount:" << path;
m_temporaryMounts.append({path, containerPath}); m_temporaryMounts.append(newMount);
stopCurrentContainer(); // Force re-start with new mounts. stopCurrentContainer(); // Force re-start with new mounts.
return true; return true;
} }