Skip to content

[Lex][Clang] Add checking to HeaderMapImpl::getString to make it more robust #131677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 20, 2025
Merged

[Lex][Clang] Add checking to HeaderMapImpl::getString to make it more robust #131677

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e80ce56
[Lex][Clang] Add checking to HeaderMapImpl::getString to make it more…
shafik Mar 17, 2025
8c399fc
Moving check up to after the assignment to MaxLen as suggested in PR.
shafik Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions clang/lib/Lex/HeaderMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,9 @@ std::optional<StringRef> HeaderMapImpl::getString(unsigned StrTabIdx) const {
unsigned MaxLen = FileBuffer->getBufferSize() - StrTabIdx;
unsigned Len = strnlen(Data, MaxLen);

if (MaxLen == 0)
return std::nullopt;

// Check whether the buffer is null-terminated.
if (Len == MaxLen && Data[Len - 1])
return std::nullopt;
Expand Down