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

fix: prevent invalid unitName cause AM crashed.

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

11
src/global.h
View File

@ -498,7 +498,14 @@ inline unitInfo processUnitName(const QString &unitName)
QString launcher; QString launcher;
QString applicationId; QString applicationId;
qDebug() << "process unit:" << unitName;
decltype(auto) appPrefix = u8"app-"; decltype(auto) appPrefix = u8"app-";
if (!unitName.startsWith(appPrefix)) {
qDebug() << "this unit " << unitName << "isn't an app unit.";
return {};
}
auto unit = unitName.sliced(sizeof(appPrefix) - 1); auto unit = unitName.sliced(sizeof(appPrefix) - 1);
if (unit.endsWith(".service")) { if (unit.endsWith(".service")) {
@ -514,7 +521,9 @@ inline unitInfo processUnitName(const QString &unitName)
if (rest.size() == 2) { if (rest.size() == 2) {
launcher = rest.takeFirst(); launcher = rest.takeFirst();
} }
applicationId = rest.takeFirst(); if (rest.size() == 1) {
applicationId = rest.takeFirst();
}
} else if (unit.endsWith(".scope")) { } else if (unit.endsWith(".scope")) {
auto lastDotIndex = unit.lastIndexOf('.'); auto lastDotIndex = unit.lastIndexOf('.');
auto app = unit.sliced(0, lastDotIndex); auto app = unit.sliced(0, lastDotIndex);