Skip to content

fix(libc): copy count units of a strxfrm or wcsxfrm result that does not fit, as titles' libc.prx does #11983

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
oneandonlydean merged 1 commit into from
Oct 28, 2026
Merged

fix(libc): copy count units of a strxfrm or wcsxfrm result that does not fit, as titles' libc.prx does #11983

Show file tree
Hide file tree
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
10 changes: 4 additions & 6 deletions core/libs/prx/libc/src/Strings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,16 +830,14 @@ int APS5_VABI wcscoll_nid_postfix(const char16_t* first, const char16_t* second)

size_t APS5_VABI wcsxfrm_nid_postfix(char16_t* destination, const char16_t* source, size_t count) {
const size_t length = Length(source);
if (count != 0) {
const size_t copied = length < count ? length : count - 1;
std::memcpy(destination, source, copied * sizeof(char16_t));
destination[copied] = 0;
}
if (count != 0) std::memcpy(destination, source, (length < count ? length + 1 : count) * sizeof(char16_t));
return length;
}

size_t APS5_VABI strxfrm_nid_postfix(char* destination, const char* source, size_t count) {
return strlcpy_nid_postfix(destination, source, count);
const size_t length = std::strlen(source);
if (count != 0) std::memcpy(destination, source, length < count ? length + 1 : count);
return length;
}

char* APS5_VABI strtok_s_nid_postfix(char* str, const char* delim, char** context) {
Expand Down
6 changes: 3 additions & 3 deletions core/libs/tests/GuestStrings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,14 +422,14 @@ int main() {
Require(std::strcmp(transformed, "abc") == 0 && transformed[4] == 'z');
std::memset(transformed, 'z', sizeof(transformed));
Require(strxfrm_nid_postfix(transformed, "abcdefgh", 4) == 8);
Require(std::strcmp(transformed, "abc") == 0 && transformed[4] == 'z');
Require(std::memcmp(transformed, "abcd", 4) == 0 && transformed[4] == 'z');
std::memset(transformed, 'z', sizeof(transformed));
Require(strxfrm_nid_postfix(transformed, "abcdefg", sizeof(transformed)) == 7 && std::strcmp(transformed, "abcdefg") == 0);
std::memset(transformed, 'z', sizeof(transformed));
Require(strxfrm_nid_postfix(transformed, "abcdefgh", sizeof(transformed)) == 8 && std::strcmp(transformed, "abcdefg") == 0);
Require(strxfrm_nid_postfix(transformed, "abcdefgh", sizeof(transformed)) == 8 && std::memcmp(transformed, "abcdefgh", 8) == 0);
std::memset(transformed, 'z', sizeof(transformed));
Require(strxfrm_nid_postfix(transformed, "", sizeof(transformed)) == 0 && transformed[0] == '\0' && transformed[1] == 'z');
Require(strxfrm_nid_postfix(transformed, "abc", 1) == 3 && transformed[0] == '\0' && transformed[1] == 'z');
Require(strxfrm_nid_postfix(transformed, "abc", 1) == 3 && transformed[0] == 'a' && transformed[1] == 'z');
Require(strxfrm_nid_postfix(nullptr, "abc", 0) == 3);
Require(strpbrk_nid_postfix(buffer, "ay") == buffer + 1);
Require(strpbrk_nid_postfix(buffer, "") == nullptr);
Expand Down
10 changes: 5 additions & 5 deletions core/libs/tests/GuestWideStrings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,8 @@ int main() {
wmemset_nid_postfix(transformed, 0xaaaa, 8);

require(wcsxfrm_nid_postfix(transformed, u"much too long", 4) == 13);
if (!same(transformed, u"muc", 4)) std::fputs("wcsxfrm did not copy and terminate its truncated result\n", stderr);
require(same(transformed, u"muc", 4) && transformed[4] == 0xaaaa);
if (!same(transformed, u"much", 4)) std::fputs("wcsxfrm did not copy the first count units of its truncated result\n", stderr);
require(same(transformed, u"much", 4) && transformed[4] == 0xaaaa);
require(wcsxfrm_nid_postfix(nullptr, u"abc", 0) == 3);
struct TransformCase {
const char16_t* source;
Expand All @@ -372,13 +372,13 @@ int main() {
};
for (const TransformCase test : {
TransformCase{u"wide", 0, 4, u"", 0},
TransformCase{u"wide", 1, 4, u"", 1},
TransformCase{u"wide", 4, 4, u"wid", 4},
TransformCase{u"wide", 1, 4, u"w", 1},
TransformCase{u"wide", 4, 4, u"wide", 4},
TransformCase{u"wide", 5, 4, u"wide", 5},
TransformCase{u"", 0, 0, u"", 0},
TransformCase{u"", 1, 0, u"", 1},
TransformCase{u"", 8, 0, u"", 1},
TransformCase{u"\x7fff\x8000\xffff\xd83d\xde00", 4, 5, u"\x7fff\x8000\xffff", 4},
TransformCase{u"\x7fff\x8000\xffff\xd83d\xde00", 4, 5, u"\x7fff\x8000\xffff\xd83d", 4},
TransformCase{u"\x7fff\x8000\xffff\xd83d\xde00", 6, 5, u"\x7fff\x8000\xffff\xd83d\xde00", 6}
}) {
wmemset_nid_postfix(transformed, 0xaaaa, 8);
Expand Down
Loading