Skip to content

prim: Fix BufferedSafeStringBase::trimMatchedString #279

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
MonsterDruide1 merged 1 commit into from
Aug 18, 2026
Merged

prim: Fix BufferedSafeStringBase::trimMatchedString #279

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
5 changes: 2 additions & 3 deletions include/prim/seadSafeString.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,18 +795,17 @@ template <typename T>
inline s32 BufferedSafeStringBase<T>::trimMatchedString(const SafeStringBase<T>& suffix)
{
const s32 length = this->calcLength();
T* buffer = getMutableStringTop_();

const s32 suffix_length = suffix.calcLength();
const s32 new_length = length - suffix_length;

if (length < suffix_length)
return length;

if (SafeStringBase<T>(&buffer[new_length]).comparen(suffix, suffix_length) != 0)
if (SafeStringBase<T>(&getMutableStringTop_()[new_length]).comparen(suffix, suffix_length) != 0)
return length;

buffer[new_length] = SafeStringBase<T>::cNullChar;
getMutableStringTop_()[new_length] = SafeStringBase<T>::cNullChar;
return new_length;
}

Expand Down
Loading