Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
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: 8 additions & 2 deletions libc/src/__support/wchar/wcsnrtombs.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,20 @@
#include "src/__support/common.h"
#include "src/__support/libc_errno.h"
#include "src/__support/macros/config.h"
#include "src/__support/macros/null_check.h"
#include "src/__support/wchar/mbstate.h"
#include "src/__support/wchar/string_converter.h"

namespace LIBC_NAMESPACE_DECL {
namespace internal {

ErrorOr<size_t> wcsnrtombs(char *__restrict s, const wchar_t **__restrict pwcs,
size_t nwc, size_t len, mbstate *ps) {
LIBC_INLINE static ErrorOr<size_t> wcsnrtombs(char *__restrict s,
const wchar_t **__restrict pwcs,
size_t nwc, size_t len,
mbstate *ps) {
LIBC_CRASH_ON_NULLPTR(pwcs);
LIBC_CRASH_ON_NULLPTR(ps);

CharacterConverter cr(ps);
if (!cr.isValidState())
return Error(EINVAL);
Expand Down
1 change: 1 addition & 0 deletions libc/src/wchar/wcsnrtombs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ namespace LIBC_NAMESPACE_DECL {
LLVM_LIBC_FUNCTION(size_t, wcsnrtombs,
(char *__restrict s, const wchar_t **__restrict pwcs,
size_t nwc, size_t len, mbstate_t *ps)) {
LIBC_CRASH_ON_NULLPTR(pwcs);
static internal::mbstate internal_mbstate;
auto result = internal::wcsnrtombs(
s, pwcs, nwc, len,
Expand Down
1 change: 1 addition & 0 deletions libc/src/wchar/wcsrtombs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ namespace LIBC_NAMESPACE_DECL {
LLVM_LIBC_FUNCTION(size_t, wcsrtombs,
(char *__restrict s, const wchar_t **__restrict pwcs,
size_t n, mbstate_t *ps)) {
LIBC_CRASH_ON_NULLPTR(pwcs);
static internal::mbstate internal_mbstate;
auto result = internal::wcsnrtombs(
s, pwcs, SIZE_MAX, n,
Expand Down
1 change: 1 addition & 0 deletions libc/src/wchar/wcstombs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ namespace LIBC_NAMESPACE_DECL {
LLVM_LIBC_FUNCTION(size_t, wcstombs,
(char *__restrict s, const wchar_t *__restrict wcs,
size_t n)) {
LIBC_CRASH_ON_NULLPTR(wcs);
static internal::mbstate internal_mbstate;
const wchar_t *wcs_ptr_copy = wcs;
auto result =
Expand Down
10 changes: 10 additions & 0 deletions libc/test/src/__support/wchar/wcsnrtombs_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -188,3 +188,13 @@ TEST(LlvmLibcWcsnrtombs, InvalidCharacter) {
ASSERT_FALSE(res.has_value());
ASSERT_EQ(res.error(), EILSEQ);
}

TEST(LlvmLibcWcsnrtombs, NullSrc) {
EXPECT_DEATH(
[] {
LIBC_NAMESPACE::internal::mbstate state;
char mbs[10];
LIBC_NAMESPACE::internal::wcsnrtombs(mbs, nullptr, 1, 1, &state);
},
WITH_SIGNAL(-1));
}
40 changes: 40 additions & 0 deletions libc/test/src/wchar/wcsnrtombs_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,43 @@ TEST_F(LlvmLibcWcsnrtombs, ErrnoTest) {
static_cast<size_t>(-1));
ASSERT_ERRNO_EQ(EILSEQ);
}

TEST_F(LlvmLibcWcsnrtombs, NullState) {
// this test is the same as DestLimit except it uses a nullptr mbstate*

/// clown emoji, sigma symbol, y with diaeresis, letter A
const wchar_t src[] = {static_cast<wchar_t>(0x1f921),
static_cast<wchar_t>(0x2211),
static_cast<wchar_t>(0xff), static_cast<wchar_t>(0x41),
static_cast<wchar_t>(0x0)};
const wchar_t *cur = src;

char mbs[11];
for (int i = 0; i < 11; ++i)
mbs[i] = '\x01'; // dummy initial values

ASSERT_EQ(LIBC_NAMESPACE::wcsnrtombs(mbs, &cur, 5, 4, nullptr),
static_cast<size_t>(4));
ASSERT_ERRNO_SUCCESS();
ASSERT_EQ(cur, src + 1);
ASSERT_EQ(mbs[0], '\xF0');
ASSERT_EQ(mbs[1], '\x9F');
ASSERT_EQ(mbs[2], '\xA4');
ASSERT_EQ(mbs[3], '\xA1');
ASSERT_EQ(mbs[4], '\x01'); // didn't write more than 4 bytes

for (int i = 0; i < 11; ++i)
mbs[i] = '\x01'; // dummy initial values

// not enough bytes to convert the second character, so only converts one
cur = src;
ASSERT_EQ(LIBC_NAMESPACE::wcsnrtombs(mbs, &cur, 5, 6, nullptr),
static_cast<size_t>(4));
ASSERT_ERRNO_SUCCESS();
ASSERT_EQ(cur, src + 1);
ASSERT_EQ(mbs[0], '\xF0');
ASSERT_EQ(mbs[1], '\x9F');
ASSERT_EQ(mbs[2], '\xA4');
ASSERT_EQ(mbs[3], '\xA1');
ASSERT_EQ(mbs[4], '\x01');
}
40 changes: 40 additions & 0 deletions libc/test/src/wchar/wcsrtombs_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,43 @@ TEST_F(LlvmLibcWcsrtombs, ErrnoTest) {
static_cast<size_t>(-1));
ASSERT_ERRNO_EQ(EILSEQ);
}

TEST_F(LlvmLibcWcsrtombs, NullState) {
// this test is the same as DestLimit except it uses a nullptr mbstate*

/// clown emoji, sigma symbol, y with diaeresis, letter A
const wchar_t src[] = {static_cast<wchar_t>(0x1f921),
static_cast<wchar_t>(0x2211),
static_cast<wchar_t>(0xff), static_cast<wchar_t>(0x41),
static_cast<wchar_t>(0x0)};
const wchar_t *cur = src;

char mbs[11];
for (int i = 0; i < 11; ++i)
mbs[i] = '\x01'; // dummy initial values

ASSERT_EQ(LIBC_NAMESPACE::wcsrtombs(mbs, &cur, 4, nullptr),
static_cast<size_t>(4));
ASSERT_ERRNO_SUCCESS();
ASSERT_EQ(cur, src + 1);
ASSERT_EQ(mbs[0], '\xF0');
ASSERT_EQ(mbs[1], '\x9F');
ASSERT_EQ(mbs[2], '\xA4');
ASSERT_EQ(mbs[3], '\xA1');
ASSERT_EQ(mbs[4], '\x01'); // didn't write more than 4 bytes

for (int i = 0; i < 11; ++i)
mbs[i] = '\x01'; // dummy initial values

// not enough bytes to convert the second character, so only converts one
cur = src;
ASSERT_EQ(LIBC_NAMESPACE::wcsrtombs(mbs, &cur, 6, nullptr),
static_cast<size_t>(4));
ASSERT_ERRNO_SUCCESS();
ASSERT_EQ(cur, src + 1);
ASSERT_EQ(mbs[0], '\xF0');
ASSERT_EQ(mbs[1], '\x9F');
ASSERT_EQ(mbs[2], '\xA4');
ASSERT_EQ(mbs[3], '\xA1');
ASSERT_EQ(mbs[4], '\x01');
}
Loading