c-index-test: fix buffer overflow #129922
Merged
Conversation
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
|
@llvm/pr-subscribers-clang Author: Jinsong Ji (jsji) ChangesFull diff: https://github.com/llvm/llvm-project/pull/129922.diff 1 Files Affected:
diff --git a/clang/tools/c-index-test/c-index-test.c b/clang/tools/c-index-test/c-index-test.c
index 942500f2975e4..eb1d3de09acd0 100644
--- a/clang/tools/c-index-test/c-index-test.c
+++ b/clang/tools/c-index-test/c-index-test.c
@@ -3555,11 +3555,11 @@ static CXIdxClientContainer makeClientContainer(CXClientData *client_data,
clang_indexLoc_getFileLocation(loc, &file, 0, &line, &column, 0);
len = sizeof(IndexDataStringList) + strlen(name) + digitCount(line) +
- digitCount(column) + 2;
+ digitCount(column) + 3;
node = (IndexDataStringList *)malloc(len);
assert(node);
newStr = node->data;
- snprintf(newStr, len, "%s:%d:%d", name, line, column);
+ snprintf(newStr, len - sizeof(IndexDataStringList) , "%s:%d:%d", name, line, column);
/* Remember string so it can be freed later. */
index_data = (IndexData *)client_data;
|
arsenm
approved these changes
Mar 6, 2025
arsenm
reviewed
Mar 6, 2025
| node = (IndexDataStringList *)malloc(len); | ||
| assert(node); | ||
| newStr = node->data; | ||
| snprintf(newStr, len, "%s:%d:%d", name, line, column); | ||
| snprintf(newStr, len - sizeof(IndexDataStringList), "%s:%d:%d", name, line, |
There was a problem hiding this comment.
Maybe factor len out of the original part and add to the malloc arg
jsji
added a commit
that referenced
this pull request
Mar 6, 2025
jph-13
pushed a commit
to jph-13/llvm-project
that referenced
this pull request
Mar 21, 2025
We should not try to overwrite the pointer of struct, also need to add 1 for end of line.
jph-13
pushed a commit
to jph-13/llvm-project
that referenced
this pull request
Mar 21, 2025
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.
We should not try to overwrite the pointer of struct, also need to add 1 for end of line.