Skip to content

fix: add null pointer guard for distributionInfo - #575

Merged
deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
kt286:fix/distribution-info-guard
Jul 24, 2026
Merged

fix: add null pointer guard for distributionInfo#575
deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
kt286:fix/distribution-info-guard

Conversation

@kt286

@kt286 kt286 commented Jul 22, 2026

Copy link
Copy Markdown
Contributor

在 distributionOrgName 和 distributionOrgWebsite 函数中增加 siGlobal->distributionInfo 的空指针检查,避免潜在的崩溃问题。

When distributionInfo is nullptr, return fallback values directly instead of accessing the null pointer.

Summary by Sourcery

Bug Fixes:

  • Handle null siGlobal->distributionInfo in distributionOrgName and distributionOrgWebsite by returning fallback values instead of dereferencing a null pointer.

在 distributionOrgName 和 distributionOrgWebsite 函数中增加
siGlobal->distributionInfo 的空指针检查,避免潜在的崩溃问题。

When distributionInfo is nullptr, return fallback values directly
instead of accessing the null pointer.
@deepin-ci-robot

Copy link
Copy Markdown
Contributor

Hi @kt286. 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

sourcery-ai Bot commented Jul 22, 2026

Copy link
Copy Markdown
Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Add nullptr guard for siGlobal->distributionInfo in distribution-related helper functions to avoid crashes and return defined fallbacks when distribution info is unavailable.

Sequence diagram for null pointer guard in distributionOrgName and distributionOrgWebsite

sequenceDiagram
    participant Caller
    participant DSysInfo
    participant siGlobal
    participant distributionInfo

    Caller->>DSysInfo: distributionOrgName(type, locale)
    DSysInfo->>siGlobal: access distributionInfo
    alt distributionInfo is nullptr
        DSysInfo-->>Caller: return fallback
    else distributionInfo is valid
        DSysInfo->>distributionInfo: localizedValue("Name", locale, sectionName, fallback)
        DSysInfo-->>Caller: return localized name
    end

    Caller->>DSysInfo: distributionOrgWebsite(type)
    DSysInfo->>siGlobal: access distributionInfo
    alt distributionInfo is nullptr
        DSysInfo-->>Caller: return { fallbackSiteName, fallbackSiteUrl }
    else distributionInfo is valid
        DSysInfo->>distributionInfo: stringValue("WebsiteName", sectionName, fallbackSiteName)
        DSysInfo->>distributionInfo: stringValue("Website", sectionName, fallbackSiteUrl)
        DSysInfo-->>Caller: return website name and url
    end
Loading

File-Level Changes

Change Details Files
Add null pointer checks around distributionInfo access in distribution organization name and website helpers to prevent crashes and use fallback values.
  • Introduce early-return guard in distributionOrgName when siGlobal->distributionInfo is null, returning the precomputed fallback name.
  • Introduce early-return guard in distributionOrgWebsite when siGlobal->distributionInfo is null, returning the precomputed fallback website name and URL pair instead of dereferencing.
  • Keep existing localized and string value lookups unchanged when distributionInfo is non-null.
src/dsysinfo.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

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown

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:

  • Consider also guarding against a null siGlobal pointer before accessing siGlobal->distributionInfo to avoid similar crashes if siGlobal is ever unset.
  • You might want to add a debug log when distributionInfo is null so that unexpected missing configuration can be diagnosed more easily while still returning the fallback values.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- Consider also guarding against a null `siGlobal` pointer before accessing `siGlobal->distributionInfo` to avoid similar crashes if `siGlobal` is ever unset.
- You might want to add a debug log when `distributionInfo` is null so that unexpected missing configuration can be diagnosed more easily while still returning the fallback values.

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.

@deepin-ci-robot

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: 18202781743, kt286

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

@18202781743

Copy link
Copy Markdown
Contributor

/forcemerge

@deepin-bot

deepin-bot Bot commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

This pr force merged! (status: blocked)

@deepin-bot
deepin-bot Bot merged commit ee48a0d into linuxdeepin:master Jul 24, 2026
20 checks passed
@kt286
kt286 deleted the fix/distribution-info-guard branch July 24, 2026 03:24
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.

3 participants