Skip to content

Conversation

@calsys456
Copy link
Contributor

@calsys456 calsys456 commented Jan 27, 2026

The problem is caused by reckless cleanup process. Check those pointers carefully to make reconnection works.

Summary by Sourcery

Guard Treeland connection teardown to prevent crashes during disconnect and allow safe reconnection.

Bug Fixes:

  • Avoid dereferencing or deleting a null notifier when disconnecting from the Treeland display.
  • Reset Treeland connector display and DDM pointers to null after disconnect to prevent use-after-free crashes.

@deepin-ci-robot
Copy link

Hi @calsys456. Thanks for your PR.

I'm waiting for a linuxdeepin member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@sourcery-ai
Copy link

sourcery-ai bot commented Jan 27, 2026

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Adds null checks around Treeland connector cleanup to prevent crashes when disconnecting, and ensures internal pointers are reset after teardown.

Updated class diagram for TreelandConnector disconnect lifecycle

classDiagram
    class TreelandConnector {
        - void* m_display
        - QSocketNotifier* m_notifier
        - DdmClient* m_ddm
        + void connect(QString socketPath)
        + void disconnect()
    }

    %% Key behavioral changes in disconnect()
    TreelandConnector : disconnect() checks m_display before teardown
    TreelandConnector : disconnect() checks m_notifier before setEnabled(false)
    TreelandConnector : disconnect() checks m_notifier before delete
    TreelandConnector : disconnect() sets m_display to nullptr after wl_display_disconnect
    TreelandConnector : disconnect() sets m_ddm to nullptr after teardown
Loading

File-Level Changes

Change Details Files
Harden Treeland disconnection logic to avoid dereferencing or reusing invalid pointers during cleanup.
  • Guard notifier usage in disconnect() with a null check before disabling it
  • Guard notifier deletion with a null check to avoid deleting a null or already-reset pointer
  • Reset m_display to nullptr after wl_display_disconnect to avoid stale pointer reuse
  • Reset m_ddm to nullptr on disconnect to keep state consistent after teardown
src/daemon/TreelandConnector.cpp

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey - I've left some high level feedback:

  • After deleting m_notifier, consider setting m_notifier to nullptr as well to avoid dangling pointers and make the cleanup pattern consistent with m_display and m_ddm.
  • The repeated if (m_notifier) checks can be simplified by wrapping both setEnabled(false) and delete in a single block or helper, improving readability and reducing the chance of future divergence.
  • The if (m_ddm) guard before m_ddm = nullptr; is unnecessary since assigning nullptr is safe even if it is already nullptr, so you can drop the condition to simplify the logic.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- After deleting `m_notifier`, consider setting `m_notifier` to `nullptr` as well to avoid dangling pointers and make the cleanup pattern consistent with `m_display` and `m_ddm`.
- The repeated `if (m_notifier)` checks can be simplified by wrapping both `setEnabled(false)` and `delete` in a single block or helper, improving readability and reducing the chance of future divergence.
- The `if (m_ddm)` guard before `m_ddm = nullptr;` is unnecessary since assigning `nullptr` is safe even if it is already `nullptr`, so you can drop the condition to simplify the logic.

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR fixes crashes that occur when Treeland (the Wayland compositor used as greeter) crashes by adding null pointer checks to the disconnect() method in TreelandConnector. The changes prevent dereferencing null pointers during cleanup and ensure proper state reset for reconnection.

Changes:

  • Added null pointer checks before accessing m_notifier in the disconnect method
  • Reset m_display and m_ddm pointers to nullptr after cleanup to support safe reconnection

@calsys456 calsys456 force-pushed the fix-wayland branch 2 times, most recently from 3f618d8 to 19273a3 Compare January 27, 2026 08:50
The problem is caused by reckless cleanup process. Check those pointers
carefully to make reconnection works.
@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: calsys456, wineee, zccrs

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@zccrs zccrs merged commit 0db0985 into linuxdeepin:master Jan 28, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants