Skip to content
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

Fix irrString use-after-free with char-like assignment (operator=) #15213

Merged
merged 16 commits into from
Oct 4, 2024
Merged

Fix irrString use-after-free with char-like assignment (operator=) #15213

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
216cbfc
Fix irrString use-after-free with char assignment
Sep 30, 2024
6e89064
Add a comment to elaborate on irrString use-after-free
Sep 30, 2024
2148ce3
Remove irrString c_str check
Sep 30, 2024
6966688
Improve comment
Sep 30, 2024
a817fdb
Early return if the string is the same
Sep 30, 2024
1c411ce
Fix whitespace
Sep 30, 2024
69edfa3
Get rid of trailing whitespace
appgurueu Sep 30, 2024
d1800f4
Please the lord and holy Savior Bjarne Stoupstrup or Stroupstrup or S…
Oct 2, 2024
288aaab
Merge branch 'master' of https://github.com/minetest/minetest into fi…
Oct 2, 2024
c7d8a83
Merge branch 'minetest:master' into fix-string-charlike-copy-use-afte…
swagtoy Oct 2, 2024
248058e
Please the lord and holy Savior Bjarne Stoupstrup or Stroupstrup or S…
Oct 2, 2024
db179d7
Take in suggestions, remove template garbage (let's wait til C++20 an…
Oct 3, 2024
0e5b3ec
Bring back string early return, remove header
Oct 4, 2024
50be2b6
Update irr/include/irrString.h
sfan5 Oct 4, 2024
8843976
fix whitespace
sfan5 Oct 4, 2024
52ad08f
fix whitespace for real
sfan5 Oct 4, 2024
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
9 changes: 5 additions & 4 deletions irr/include/irrString.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,11 @@ class string
// no longer allowed!
_IRR_DEBUG_BREAK_IF((void *)c == (void *)c_str());

u32 len = calclen(c);
str.resize(len);
for (u32 l = 0; l < len; ++l)
str[l] = (T)c[l];
u32 len = calclen(c);
if (len > str.size()) str.resize(len);
for (u32 l = 0; l < len; ++l)
str[l] = static_cast<T>(c[l]);
if (len < str.size()) str.resize(len);

return *this;
}
Expand Down
Loading