Skip to content

fix: Improve argument handling in QProcess commands #608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Mar 2, 2026
Merged

fix: Improve argument handling in QProcess commands #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deepin-devicemanager-server/deepin-devicecontrol/src/controlinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ bool ControlInterface::enableKeyboard(const QString& vid, const QString& pid, co
return false;
}

QString rulesFile = QString(UDEV_RULES_PATH_LOCAL "/99-keyboard-device-control-%1-%2.rules").arg(vid).arg(pid);
QString rulesFile = QString(UDEV_RULES_PATH_LOCAL "/99-keyboard-device-control-%1-%2.rules").arg(safeVid).arg(safePid);

QString ruleContent;
if (enable_device) {
Expand Down
2 changes: 1 addition & 1 deletion deepin-devicemanager-server/deepin-devicecontrol/src/enablecontrol/enablesqlmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@
return uniqueIDExisted(key, path);
}

bool EnableSqlManager::isUniqueIdEnabled(const QString &key)

Check warning on line 153 in deepin-devicemanager-server/deepin-devicecontrol/src/enablecontrol/enablesqlmanager.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'isUniqueIdEnabled' is never used.
{
qCDebug(appLog) << "Checking if unique ID is enabled:" << key;
QString sql = QString("SELECT enable FROM %1 WHERE unique_id='%2';").arg(DB_TABLE_AUTHORIZED).arg(":key");
QString sql = QString("SELECT enable FROM %1 WHERE unique_id=:key;").arg(DB_TABLE_AUTHORIZED);
if(!m_sqlQuery.prepare(sql)) return false;
m_sqlQuery.bindValue(":key", QVariant(key));
if (m_sqlQuery.exec() && m_sqlQuery.next()) {
Expand Down
2 changes: 1 addition & 1 deletion deepin-devicemanager/src/DeviceManager/DeviceInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ void DeviceBaseInfo::setVendorNameBylsusbLspci(const QString &vidpid, const QStr
QProcess process;
QString vendorId = vidpid.toLower().remove("0x").trimmed().left(4);
QString deviceId = vidpid.toLower().remove("0x").trimmed().right(4);
process.start("lsusb -v -d " + vendorId + ":" + deviceId);
process.start("lsusb", QStringList() << "-v" << "-d" << QString("%1:%2").arg(vendorId, deviceId));
process.waitForFinished(-1);

QString output = process.readAllStandardOutput();
Expand Down
4 changes: 2 additions & 2 deletions deepin-devicemanager/src/DriverControl/HttpDriverInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ QString HttpDriverInterface::getRequestBoard(QString strManufacturer, QString st
if (!build.isEmpty()) {
qCDebug(appLog) << "OS build is not empty, adding to URL";
QString system = build;
if (build[1] == "1") //专业版通过【产品线类型-产品线版本】方式进行系统构建匹配
if (build.length() > 3 && build[1] == '1') //专业版通过【产品线类型-产品线版本】方式进行系统构建匹配
system = QString("%1-%2").arg(build[1]).arg(build[3]);
strUrl += "&system=" + system;
}
Expand All @@ -127,7 +127,7 @@ QString HttpDriverInterface::getRequestBoard(QString strManufacturer, QString st
qCDebug(appLog) << "OS build is not empty, adding to URL";
QString system = build;

if (build[1] == "1") //专业版通过【产品线类型-产品线版本】方式进行系统构建匹配
if (build.length() > 3 && build[1] == '1') //专业版通过【产品线类型-产品线版本】方式进行系统构建匹配
system = QString("%1-%2").arg(build[1]).arg(build[3]);

strUrl += "&system=" + system;
Expand Down