Skip to content

fix: resolve dangling pointer in filePath - #411

Merged
deepin-bot[bot] merged 1 commit into
linuxdeepin:release/eaglefrom
liyigang1:agent/pms-bug-bot/b092dc8a2998
Oct 23, 2026
Merged

deepin-bot[bot] merged 1 commit into
linuxdeepin:release/eaglefrom
liyigang1:agent/pms-bug-bot/b092dc8a2998

Conversation

@liyigang1

@liyigang1 liyigang1 commented Oct 23, 2026 •

Copy link
Copy Markdown
Contributor

修复 PMS BUG-380499:目录遍历文件计数不正确

根因

DEnumeratorPrivate::filePath() 通过 return path.toUtf8().data() / url.userInfo()...toLatin1().data() 返回 char*,临时 QByteArray 在函数返回时被销毁,导致悬垂指针。sortFileInfoList() 中使用该悬垂指针做 strcmp 触发未定义行为,导致目录遍历返回错误的文件数量。

修复方案

使用 strdup() 分配堆内存返回路径字符串,由调用方负责 free() 释放。返回类型保持 char* 不变,两处调用点(openDirByfts() 和 sortFileInfoList())均增加空指针检查并正确释放内存。同时移除 dfm-list.cpp 中未使用的 #include <stdio.h>。

改动文件

  • src/dfm-io/dfm-io/denumerator.cpp:filePath() 使用 strdup() 分配堆内存;openDirByfts() 和 sortFileInfoList() 增加空指针检查与内存释放
  • src/dfm-io/tools/dfm-list.cpp:移除未使用的 #include <stdio.h>

影响范围

filePath() 为 private 方法,返回类型 char* 未变,无 API/ABI 影响。

Summary by Sourcery

Fix directory enumeration to use valid file path data and report allocation failures safely.

Bug Fixes:

  • Fix incorrect directory traversal file counts caused by invalid file path data during sorting.

Enhancements:

  • Make file path data lifetime-safe while preserving the private method’s existing interface usage.
  • Add failure handling for path allocation failures and remove an unused standard I/O include.

@sourcery-ai

sourcery-ai Bot commented Oct 23, 2026

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

Reviewer's Guide

Fixes incorrect directory traversal counts caused by filePath() returning pointers to destroyed temporary QByteArrays. The private helper now returns an owning QByteArray, and its callers explicitly preserve or consume that storage safely before using the underlying path data.

Sequence diagram for safe filePath lifetime during directory sorting

sequenceDiagram
    participant D as DEnumeratorPrivate
    participant B as QByteArray
    participant F as fts
    D->>D: filePath(uri)
    D->>B: Return owning path bytes
    D->>B: constData()
    B-->>D: Stable path pointer
    D->>F: fts_read()
    D->>D: sortFileInfoList()
    D->>B: Destroy after path use
Loading

File-Level Changes

Change Details Files
Make file path storage lifetime-safe by returning an owning QByteArray instead of a pointer into a temporary byte array.
  • Change the private filePath() return type and return QByteArray values directly.
  • Adapt directory-opening path duplication to read from QByteArray::constData().
  • Keep the QByteArray alive while sortFileInfoList() uses its constData() pointer for path comparisons.
src/dfm-io/dfm-io/private/denumerator_p.h
src/dfm-io/dfm-io/denumerator.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 reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨

@liyigang1
liyigang1 force-pushed the agent/pms-bug-bot/b092dc8a2998 branch 3 times, most recently from d34e8c9 to a060a74 Compare October 23, 2026 06:38
1. Root cause: DEnumeratorPrivate::filePath() returned
   toUtf8().data()/toLatin1().data() from temporary QByteArray,
   causing dangling pointer after function return
2. Fix: change filePath() to return QByteArray by value, ensuring
   RAII lifetime; openDirByfts() wraps result with strdup() for
   fts_open, sortFileInfoList() uses constData() directly
3. Impact: eliminates dangling pointer and manual free() in
   sortFileInfoList(), fixing incorrect file counts in directory
   traversal; remove unused stdio.h include in dfm-list

Log: Fix incorrect directory traversal file counts caused by dangling pointer in filePath

Influence:
1. Test directory enumeration returns correct file counts
2. Test directory traversal with special characters in paths
3. Verify no memory leaks in filePath and sortFileInfoList

fix: 修复 filePath 悬垂指针导致目录遍历文件计数错误

1. 根因:DEnumeratorPrivate::filePath() 通过 toUtf8().data()/
   toLatin1().data() 返回临时 QByteArray 的内部指针,函数返回
   后临时对象销毁产生悬垂指针
2. 方案:将 filePath() 返回类型改为 QByteArray(按值返回),利用
   RAII 管理生命周期;openDirByfts() 用 strdup() 包装供 fts_open
   使用,sortFileInfoList() 直接使用 constData()
3. 影响:消除 sortFileInfoList() 中的悬垂指针和手动 free(),
   修复目录遍历文件计数不正确的问题

Log: 修复目录遍历文件计数不正确的问题

Influence:
1. 测试目录遍历返回正确的文件数量
2. 测试包含特殊字符路径的目录遍历
3. 验证 filePath 和 sortFileInfoList 无内存泄漏

PMS: BUG-380499 BUG-333909
@liyigang1
liyigang1 force-pushed the agent/pms-bug-bot/b092dc8a2998 branch from a060a74 to ad0c939 Compare October 23, 2026 06:40
@deepin-ci-robot

Copy link
Copy Markdown

deepin pr auto review

🤖 AI 代码审查报告

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

Pass


📊 总体评价

项目 结果
审查结论 代码审查通过
评分详情 本次提交修复了 filePath 函数的悬垂指针问题,将返回类型从 char* 改为 QByteArray,正确管理了内存生命周期。同时增加了 strdup 失败的空指针检查,移除了未使用的头文件引用。四维度均无问题,代码安全无漏洞。

🔍 详细分析

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: liyigang1, max-lvs

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

@liyigang1

Copy link
Copy Markdown
Contributor Author

/forcemerge

@deepin-bot

deepin-bot Bot commented Oct 23, 2026

Copy link
Copy Markdown

This pr force merged! (status: unstable)

@deepin-bot
deepin-bot Bot merged commit 745c132 into linuxdeepin:release/eagle Oct 23, 2026
16 of 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.

4 participants