Skip to content

fix: stop backend write thread before teardown in ~Settings #629

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
lzwind merged 1 commit into from
Sep 29, 2026
Merged

fix: stop backend write thread before teardown in ~Settings #629

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
10 changes: 10 additions & 0 deletions src/common/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,16 @@ Settings::~Settings()
if (s_pSetting == this) {
s_pSetting = nullptr;
}
// 先销毁 DSettings 再销毁后端：setBackend() 会将 backend moveToThread
// 到专门的写线程，doSetOption/doSync 经队列在该线程异步落盘，仅
// DSettings::destroyed 会 quit+wait 该线程。若先 delete m_backend，
// 主线程销毁 backend（及其 QSettings）会与写线程在途的 doSetOption
// 竞态（QSettings UAF → SIGSEGV，CI test_settings 套件复现），且
// settings 裸指针从不释放；此处先停写线程，后端销毁即无并发风险
if (settings != nullptr) {
delete settings;
settings = nullptr;
}
if (m_backend != nullptr) {
qDebug() << "Cleaning up settings backend";
delete m_backend;
Expand Down
Loading