blumia/dde-application-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refact: add some checks

Browse Source 
Signed-off-by: ComixHe <heyuming@deepin.org>
This commit is contained in:
ComixHe 2023-11-15 10:29:13 +08:00 committed by Comix
parent b9bbfb7f6d
commit 3d8b834e3c
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cgroupsidentifier.cpp
View File

@ -60,12 +60,22 @@ QString CGroupsIdentifier::parseCGroupsPath(QFile &cgroupFile) noexcept
} }
auto CGPSlices = CGP.split('/', Qt::SkipEmptyParts); auto CGPSlices = CGP.split('/', Qt::SkipEmptyParts);
if (CGPSlices.isEmpty()) {
qCritical() << "invalid cgroups path,abort.";
return {};
}
if (CGPSlices.first() != "user.slice") { if (CGPSlices.first() != "user.slice") {
qWarning() << "unrecognized process."; qWarning() << "unrecognized process.";
return {}; return {};
} }
auto processUIDStr = CGPSlices[1].split('.').first().split('-').last();
auto userSlice = CGPSlices.at(1);
if (userSlice.isEmpty()) {
qWarning() << "couldn't detect uid.";
return {};
}
auto processUIDStr = userSlice.split('.').first().split('-').last();
if (processUIDStr.isEmpty()) { if (processUIDStr.isEmpty()) {
qWarning() << "no uid found."; qWarning() << "no uid found.";

2
src/dbus/applicationservice.cpp
View File

@ -863,7 +863,7 @@ LaunchTask ApplicationService::unescapeExec(const QString &str, const QStringLis
} }
auto list = matcher.capturedTexts(); auto list = matcher.capturedTexts();
if (list.count() > 1) { if (list.count() != 1) {
qWarning() << "invalid exec format, all filed code will be ignored."; qWarning() << "invalid exec format, all filed code will be ignored.";
for (const auto &code : list) { for (const auto &code : list) {
execList.removeOne(code); execList.removeOne(code);

4
src/global.h
View File

@ -473,6 +473,10 @@ inline QString getCurrentDesktop()
qWarning() << "multi-DE is detected, use first value."; qWarning() << "multi-DE is detected, use first value.";
} }
if (desktops.isEmpty()) {
return "DDE";
}
return desktops.first(); return desktops.first();
} }