fix string corruption in file finder #655
Merged
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
jonas
reviewed
Jul 8, 2017
src/ui.c
Outdated
| @@ -64,7 +64,7 @@ file_finder_read(struct file_finder *finder, const char *commit) | |||
| break; | |||
| } | |||
|
|
|||
| finder->file[files] = calloc(1, sizeof(*finder->file) + buf.size); | |||
| finder->file[files] = calloc(1, sizeof(*finder->file) + buf.size + 1); | |||
There was a problem hiding this comment.
Did you see this default? The text field in file_finder_line has size 1 to account for the NUL byte.
There was a problem hiding this comment.
Oh, I thought the first term was just to count the other member of the struct.
The issue is still there as described, because sizeof(*finder->file) returns constant sizeof(uintptr_t), coincidentally size_t, the size of matches, the other member of the struct.
It should be sizeof(**finder->file) or sizeof(struct file_finder_line). The second one is better because it's harder to typo. And either is better than my + 1 because of alignment.
rolandwalker
force-pushed
the
file-finder-string-termination
branch
from
ca989aa to
8b10c69
Compare
|
Thanks a lot for fixing this! |
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.
Allocate one more byte for file-finder items[edited]Allocate the full
sizeof(struct file_finder_line)rather than the size of a pointer, so that there is enough memory for the NUL terminator (and so that the NUL is pre-filled).Otherwise
strncpy()will take up the entire space, and tig may later read past the end.