andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

Make sure that path passed to WriteData is block device.

This commit is contained in:
Andrius Štikonas 2022-02-05 14:42:17 +00:00
parent 81a5eae665
commit 4ef17463ff
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/externalcommandhelper.cpp
View File

@ -291,7 +291,7 @@ QByteArray ExternalCommandHelper::ReadData(const QString& device, const qint64 o
if (length > MiB) { if (length > MiB) {
return {}; return {};
} }
if (!std::filesystem::is_block_file(device.toStdString())) { if (!std::filesystem::is_block_file(device.toStdU16String())) {
qWarning() << "Not a block device"; qWarning() << "Not a block device";
return {}; return {};
} }
@ -313,7 +313,15 @@ bool ExternalCommandHelper::WriteData(const QByteArray& buffer, const QString& t
if ( targetDevice.left(5) != QStringLiteral("/dev/") ) if ( targetDevice.left(5) != QStringLiteral("/dev/") )
return false; return false;
return writeData(targetDevice, buffer, targetOffset); auto targetPath = std::filesystem::path(targetDevice.toStdU16String());
if (!std::filesystem::is_block_file(targetDevice.toStdU16String())) {
qWarning() << "Not a block device";
return {};
}
auto canonicalTargetPath = std::filesystem::canonical(targetPath);
return writeData(QLatin1String(canonicalTargetPath.c_str()), buffer, targetOffset);
} }
QVariantMap ExternalCommandHelper::RunCommand(const QString& command, const QStringList& arguments, const QByteArray& input, const int processChannelMode) QVariantMap ExternalCommandHelper::RunCommand(const QString& command, const QStringList& arguments, const QByteArray& input, const int processChannelMode)