Skip to content

[core] Protect a string search from running out of bounds. #21320

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
hageboeck merged 1 commit into from
Feb 23, 2026
Merged

[core] Protect a string search from running out of bounds. #21320

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions core/foundation/src/TClassEdit.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1598,16 +1598,16 @@ static void ResolveTypedefImpl(const char *tname,
}
// In Windows, we might have 'class const ...' as name,
// (never 'const class ...'), so skip the leading 'class ', if any
if (strncmp(tname+cursor,"class ",6) == 0) {
if (cursor < len && strncmp(tname+cursor,"class ",6) == 0) {
cursor += 6;
}
if (strncmp(tname+cursor,"const ",6) == 0) {
if (cursor < len && strncmp(tname+cursor,"const ",6) == 0) {
cursor += 6;
if (modified) result += "const ";
constprefix = true;
}

if (len > 2 && strncmp(tname+cursor,"::",2) == 0) {
if (len > 2 && cursor < len && strncmp(tname+cursor,"::",2) == 0) {
cursor += 2;
}

Expand Down Expand Up @@ -1754,7 +1754,7 @@ static void ResolveTypedefImpl(const char *tname,
while ((cursor+1)<len && tname[cursor+1] == ' ') ++cursor;

auto next = cursor+1;
if (strncmp(tname+next,"const",5) == 0 && ((next+5)==len || tname[next+5] == ' ' || tname[next+5] == '*' || tname[next+5] == '&' || tname[next+5] == ',' || tname[next+5] == '>' || tname[next+5] == ')' || tname[next+5] == ']'))
if (next < len && strncmp(tname+next,"const",5) == 0 && ((next+5)==len || tname[next+5] == ' ' || tname[next+5] == '*' || tname[next+5] == '&' || tname[next+5] == ',' || tname[next+5] == '>' || tname[next+5] == ')' || tname[next+5] == ']'))
{
// A first const after the type needs to be move in the front.
if (!modified) {
Expand Down Expand Up @@ -1790,7 +1790,7 @@ static void ResolveTypedefImpl(const char *tname,
if (tname[cursor] != ' ') end_of_type = cursor;
// check and skip const (followed by *,&, ,) ... what about followed by ':','['?
auto next = cursor+1;
if (strncmp(tname+next,"const",5) == 0) {
if (next < len && strncmp(tname+next,"const",5) == 0) {
if ((next+5)==len || tname[next+5] == ' ' || tname[next+5] == '*' || tname[next+5] == '&' || tname[next+5] == ',' || tname[next+5] == '>' || tname[next+5] == ')' || tname[next+5] == '[') {
next += 5;
}
Expand All @@ -1799,7 +1799,7 @@ static void ResolveTypedefImpl(const char *tname,
(tname[next] == ' ' || tname[next] == '*' || tname[next] == '&')) {
++next;
// check and skip const (followed by *,&, ,) ... what about followed by ':','['?
if (strncmp(tname+next,"const",5) == 0) {
if (next < len && strncmp(tname+next,"const",5) == 0) {
if ((next+5)==len || tname[next+5] == ' ' || tname[next+5] == '*' || tname[next+5] == '&' || tname[next+5] == ',' || tname[next+5] == '>'|| tname[next+5] == ')' || tname[next+5] == '[') {
next += 5;
}
Expand Down
Loading