Skip to content

fix: clear stale boardVendorKey in else branch - #875

Merged
deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
add-uos:agent/pms-bug-bot/bd1d64773cec
Oct 26, 2026
Merged

deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
add-uos:agent/pms-bug-bot/bd1d64773cec

Conversation

@add-uos

@add-uos add-uos commented Oct 23, 2026 •

Copy link
Copy Markdown
Contributor

fix: clear stale boardVendorKey in else branch

  1. Root cause: checkBoardVendorFlag() else branch does not clear
    static boardVendorKey before dmidecode matching, leaving stale
    cache from previous calls across device type changes
  2. Fix: add boardVendorKey = "" at else branch entry to reset cache,
    ensuring clean state before model detection begins
  3. Impact: M900/W525 fallback logic now triggers correctly when no
    known model matches; specialComType != -1 branch unaffected

Log: Fixed board vendor detection on unknown device models

Influence:

  1. Test board vendor detection on known models (KLVV/KLVU/PGUV/PGUW/PGUX)
  2. Test M900/W525 fallback when dmidecode returns unknown model
  3. Verify no regression on specialComType-based device detection

fix: 修复 else 分支中 boardVendorKey 缓存残留问题

  1. 根因:checkBoardVendorFlag() else 分支在 dmidecode 匹配前未清空
    静态变量 boardVendorKey,导致跨调用缓存残留
  2. 方案:在 else 分支入口处添加 boardVendorKey = "" 重置缓存,
    确保机型检测前状态干净
  3. 影响:未知机型时 M900/W525 兜底逻辑恢复正常触发;不影响
    specialComType != -1 分支

Log: 修复未知机型设备的主板厂商检测问题

Influence:

  1. 测试已知机型(KLVV/KLVU/PGUV/PGUW/PGUX)的主板厂商检测
  2. 测试未知机型时 M900/W525 兜底逻辑是否正常触发
  3. 验证 specialComType 分支的设备检测无回归

PMS: BUG-V-6376

Summary by Sourcery

Bug Fixes:

  • Reset stale board vendor detection state before identifying unknown device models, restoring correct M900/W525 fallback behavior.

1. Root cause: checkBoardVendorFlag() else branch does not clear
   static boardVendorKey before dmidecode matching, leaving stale
   cache from previous calls across device type changes
2. Fix: add boardVendorKey = "" at else branch entry to reset cache,
   ensuring clean state before model detection begins
3. Impact: M900/W525 fallback logic now triggers correctly when no
   known model matches; specialComType != -1 branch unaffected

Log: Fixed board vendor detection on unknown device models

Influence:
1. Test board vendor detection on known models (KLVV/KLVU/PGUV/PGUW/PGUX)
2. Test M900/W525 fallback when dmidecode returns unknown model
3. Verify no regression on specialComType-based device detection

fix: 修复 else 分支中 boardVendorKey 缓存残留问题

1. 根因:checkBoardVendorFlag() else 分支在 dmidecode 匹配前未清空
   静态变量 boardVendorKey,导致跨调用缓存残留
2. 方案:在 else 分支入口处添加 boardVendorKey = "" 重置缓存,
   确保机型检测前状态干净
3. 影响:未知机型时 M900/W525 兜底逻辑恢复正常触发;不影响
   specialComType != -1 分支

Log: 修复未知机型设备的主板厂商检测问题

Influence:
1. 测试已知机型(KLVV/KLVU/PGUV/PGUW/PGUX)的主板厂商检测
2. 测试未知机型时 M900/W525 兜底逻辑是否正常触发
3. 验证 specialComType 分支的设备检测无回归

PMS: BUG-V-6376
@sourcery-ai

sourcery-ai Bot commented Oct 23, 2026

Copy link
Copy Markdown

Sorry @add-uos, you've used your own review budget of 250,000 diff characters for the last 7 days.

You can request another review in 5 days and 4 hours by commenting @sourcery-ai review. Upgrade to get a review now.

@sourcery-ai

sourcery-ai Bot commented Oct 23, 2026

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

Reviewer's Guide

This fix eliminates stale boardVendorKey state across device-type changes by clearing the cache before fallback model detection, allowing unknown-model M900/W525 handling to trigger correctly without affecting specialComType-based detection.

Sequence diagram for board vendor detection cache reset

sequenceDiagram
    participant Caller
    participant Common
    participant Dmidecode

    Caller->>Common: checkBoardVendorFlag()
    alt specialComType != -1
        Common-->>Caller: board vendor result
    else fallback model detection
        Common->>Common: boardVendorKey = ""
        Common->>Dmidecode: start("dmidecode", "-s system-product-name")
        Dmidecode-->>Common: system product name
        alt known model match
            Common-->>Caller: board vendor result
        else unknown model
            Common-->>Caller: M900/W525 fallback result
        end
    end
Loading

File-Level Changes

Change Details Files
Reset the cached board-vendor key before detecting the vendor from dmidecode output in the fallback branch.
  • Clear the static boardVendorKey at entry to the specialComType == -1 branch.
  • Preserve existing dmidecode-based model matching and M900/W525 fallback behavior while preventing values from previous calls from being reused.
deepin-devicemanager/src/commonfunction.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

@deepin-ci-robot

Copy link
Copy Markdown

deepin pr auto review

🤖 AI 代码审查报告

总体评分: 100 分 (通过阈值: 70分)

Pass


📊 总体评价

项目 结果
审查结论 代码审查通过
评分详情 本次提交在 else 分支中清除可能残留的 boardVendorKey 值,修复了脏数据问题。变更仅一行赋值语句,语法正确、逻辑清晰,无安全漏洞,三维度分析(AI/启发式/OCR)均无问题发现。

🔍 详细分析

1. 语法逻辑 ✅

评价: 语法正确,逻辑清晰 ✅ 通过

潜在问题:
✅ 未发现明显问题

建议: []


2. 代码质量 ✅

评价: 代码结构清晰,注释完整 ✅ 通过

潜在问题:
✅ 未发现明显问题

建议: []


3. 代码性能 ✅

评价: 性能良好,资源使用合理 ✅ 通过

潜在问题:
✅ 未发现明显问题

建议: []


4. 代码安全 🔒

评价: 存在0个安全漏洞 ✅ 通过

🔐 发现 0 个安全漏洞

安全漏洞详情:
✅ 未发现安全漏洞

建议: []


💡 改进建议代码示例


本报告由 AI 代码审查工具自动生成

@deepin-ci-robot

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: add-uos, lzwind

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

@add-uos

add-uos commented Oct 26, 2026

Copy link
Copy Markdown
Contributor Author

/merge

@deepin-bot

deepin-bot Bot commented Oct 26, 2026

Copy link
Copy Markdown
Contributor

This pr cannot be merged! (status: unknown)

@add-uos

add-uos commented Oct 26, 2026

Copy link
Copy Markdown
Contributor Author

/forcemerge

1 similar comment
@add-uos

add-uos commented Oct 26, 2026

Copy link
Copy Markdown
Contributor Author

/forcemerge

@deepin-bot
deepin-bot Bot merged commit de39d5f into linuxdeepin:master Oct 26, 2026
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants