Skip to content

[libc] wmemcmp nullptr handling #142058

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 6 commits into from
May 30, 2025
Merged

[libc] wmemcmp nullptr handling #142058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
24f44ad
[libc] wmemcmp nullptr handling
May 29, 2025
7aadafc
Merge remote-tracking branch 'upstream/main' into wmemcmp-nullptr
May 29, 2025
cb2c89e
Merge branch 'main' into wmemcmp-nullptr
sribee8 May 30, 2025
03a931c
Merge branch 'main' into wmemcmp-nullptr
sribee8 May 30, 2025
86853d9
added null_check to depends and death tests
May 30, 2025
d82fcf1
Added if defined for null check
May 30, 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
1 change: 1 addition & 0 deletions libc/src/wchar/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,5 @@ add_entrypoint_object(
libc.hdr.types.size_t
libc.hdr.wchar_macros
libc.src.__support.wctype_utils
libc.src.__support.macros.null_check
)
3 changes: 3 additions & 0 deletions libc/src/wchar/wmemcmp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,14 @@
#include "hdr/types/wchar_t.h"
#include "src/__support/common.h"
#include "src/__support/macros/config.h"
#include "src/__support/macros/null_check.h" // LIBC_CRASH_ON_NULLPTR

namespace LIBC_NAMESPACE_DECL {

LLVM_LIBC_FUNCTION(int, wmemcmp,
(const wchar_t *s1, const wchar_t *s2, size_t n)) {
LIBC_CRASH_ON_NULLPTR(s1);
LIBC_CRASH_ON_NULLPTR(s2);
for (size_t i = 0; i < n; ++i) {
if (s1[i] != s2[i])
return (int)(s1[i] - s2[i]);
Expand Down
10 changes: 10 additions & 0 deletions libc/test/src/wchar/wmemcmp_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,13 @@ TEST(LlvmLibcWMemcmpTest, LhsRhsAreTheSameLong) {
const wchar_t *rhs = L"aaaaaaaaaaaaaa";
EXPECT_EQ(LIBC_NAMESPACE::wmemcmp(lhs, rhs, 15), 0);
}

#if defined(LIBC_ADD_NULL_CHECKS) && !defined(LIBC_HAS_SANITIZER)
TEST(LlvmLibcWMemcmpTest, NullptrCrash) {
// Passing in a nullptr should crash the program.
EXPECT_DEATH([] { LIBC_NAMESPACE::wmemcmp(L"aaaaaaaaaaaaaa", nullptr, 15); },
WITH_SIGNAL(-1));
EXPECT_DEATH([] { LIBC_NAMESPACE::wmemcmp(nullptr, L"aaaaaaaaaaaaaa", 15); },
WITH_SIGNAL(-1));
}
#endif // LIBC_HAS_ADDRESS_SANITIZER
Loading