refactor: convert xsettings from executable to plugin #43
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| [D-BUS Service] | ||
| Name=org.deepin.dde.XSettings1 | ||
| Exec=/usr/bin/deepin-service-manager -n org.deepin.dde.XSettings1 | ||
| SystemdService=org.deepin.dde.XSettings1.service |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| // SPDX-FileCopyrightText: 2025 UnionTech Software Technology Co., Ltd. | ||
| // | ||
| // SPDX-License-Identifier: LGPL-3.0-or-later | ||
|
|
||
| #include "impl/xsettings1.h" | ||
|
|
||
| #include <QDBusConnection> | ||
| #include <QDBusConnectionInterface> | ||
|
|
||
| static XSettings1 *xSettings = nullptr; | ||
|
|
||
| extern "C" int DSMRegister(const char *name, void *data) | ||
| { | ||
|
|
||
| auto connection = reinterpret_cast<QDBusConnection *>(data); | ||
| if (connection->interface()->isServiceRegistered(name)) { | ||
| qWarning() << "DBus service already exists:" << name; | ||
| return 1; | ||
| } | ||
| xSettings = new XSettings1(); | ||
|
There was a problem hiding this comment. issue (bug_risk): Guard against multiple DSMRegister calls to avoid leaking/reusing the global instance. A second DSMRegister call would overwrite the global if (xSettings) {
qWarning() << "XSettings1 already instantiated";
return 1;
}before allocating to make the singleton’s lifecycle explicit and prevent misuse. |
||
|
|
||
| QDBusConnection::RegisterOptions opts = QDBusConnection::ExportAllSlots | QDBusConnection::ExportAllSignals | QDBusConnection::ExportAllProperties; | ||
| QString path = name; | ||
| path = QString("/%1").arg(path.replace(".", "/")); | ||
| connection->registerObject(path, xSettings, opts); | ||
| return 0; | ||
| } | ||
|
|
||
| // 该函数用于资源释放 | ||
| // 非常驻插件必须实现该函数，以防内存泄漏 | ||
| extern "C" int DSMUnRegister(const char *name, void *data) | ||
| { | ||
| Q_UNUSED(name); | ||
| Q_UNUSED(data); | ||
| if (xSettings) { | ||
| xSettings->deleteLater(); | ||
| xSettings = nullptr; | ||
| } | ||
| return 0; | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
issue (bug_risk): Defensive checks for
data/connectionbefore use would avoid undefined behavior.Here we
reinterpret_castand immediately callconnection->interface()without validatingdataor the interface pointer. IfDSMRegisteris ever invoked with a null or unexpecteddata, this will dereference a null pointer and crash. Please add guards, e.g.:Optionally log a warning so these failures are diagnosable.