2.0 hotfix: Resolve intermittent crash due to zero-byte reads in log reading #1501
Conversation
This file contains 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
henryzhx8
reviewed
May 22, 2024
| @@ -2087,7 +2090,7 @@ LogFileReader::RemoveLastIncompleteLog(char* buffer, int32_t size, int32_t& roll | |||
| */ | |||
| StringView LogFileReader::GetLastLine(StringView buffer, size_t end) { | |||
| if (end == 0) { | |||
| return buffer; | |||
| return StringView(buffer.data(), 0); | |||
There was a problem hiding this comment.
外层函数要处理吗？boost遇到size=0是什么行为？
There was a problem hiding this comment.
补了一个单测，boost的结果是一个空字符串。GetLastLine的返回结果只会用到开始的位置，只要是以buffer.data()开头的，应该没有问题。
messixukejia
approved these changes
May 23, 2024
yyuuttaaoo
approved these changes
May 23, 2024
yyuuttaaoo
changed the title
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
问题
超时导致force read后，如果下一次读取是以\n开头的，那么这个\n应该被忽略掉。
但是当只读取了一个\n时，这个回退操作会导致读取的长度nbytes变为0，触发内存越界。