fix: issue of corrupted PNG file.#174
Merged
deepin-bot[bot] merged 1 commit intolinuxdeepin:develop/eaglefrom Jan 5, 2026
Merged
fix: issue of corrupted PNG file.#174deepin-bot[bot] merged 1 commit intolinuxdeepin:develop/eaglefrom
deepin-bot[bot] merged 1 commit intolinuxdeepin:develop/eaglefrom
Conversation
Some corrupted PNG files will trigger error messages during parsing, but data is still read from them, and we process them following the normal procedure. 某些已损坏的PNG文件解析时会报错,但同时也读取到了数据,我们按正常流程处理。 Bug: https://pms.uniontech.com//bug-view-346475.html
deepin pr auto review我来对这个代码修改进行审查:
a) 逻辑错误: if (readerF.read(&try_res)) {
qInfo() << "img read success after can read, file:" << path;
} else {
qWarning() << "img read failed after can read, file:" << path;
}这里有个严重的逻辑问题:即使read()返回false,代码也没有进行错误处理,而是继续执行。根据注释说"某些已损坏的PNG文件这里会返回false,但同时也读取到了数据",这种处理方式是不安全的,因为:
b) 代码冗余: c) 错误处理不完整:
if (readerF.canRead()) {
qInfo() << "Attempting to read image file:" << path;
if (readerF.read(&try_res)) {
// 验证读取的图片是否有效
if (!try_res.isNull()) {
qInfo() << "Successfully read image file:" << path;
} else {
errorMsg = "Read returned true but image is null: " + path;
return false;
}
} else {
errorMsg = "Failed to read image: " + readerF.errorString() + format;
qWarning() << errorMsg;
return false;
}
}
这些改进将使代码更加健壮和安全,同时保持良好的性能。 |
max-lvs
approved these changes
Jan 5, 2026
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: lichaofan2008, max-lvs The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Contributor
Author
|
/merge |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Some corrupted PNG files will trigger error messages during parsing, but data is still read from them, and we process them following the normal procedure.
某些已损坏的PNG文件解析时会报错,但同时也读取到了数据,我们按正常流程处理。
Bug: https://pms.uniontech.com//bug-view-346475.html