griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-10-25 16:52:00 +11:00
parent 04aa583526 98cae94f6b
commit c5df2cebed
2 changed files with 87 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
source/blender/blenlib/intern/string_utf8.cc
View File

@@ -395,11 +395,23 @@ size_t BLI_wstrlen_utf8(const wchar_t *src)
size_t BLI_strlen_utf8_ex(const char *strc, size_t *r_len_bytes)
{
size_t len;
size_t len = 0;
const char *strc_orig = strc;
for (len = 0; *strc; len++) {
strc += BLI_str_utf8_size_safe(strc);
while (*strc) {
int step = BLI_str_utf8_size_safe(strc);
/* Detect null bytes within multi-byte sequences.
* This matches the behavior of #BLI_strncpy_utf8 for incomplete byte sequences. */
for (int i = 1; i < step; i++) {
if (UNLIKELY(strc[i] == '\0')) {
step = i;
break;
}
}
strc += step;
len++;
}
*r_len_bytes = size_t(strc - strc_orig);
@@ -418,11 +430,20 @@ size_t BLI_strnlen_utf8_ex(const char *strc, const size_t strc_maxlen, size_t *r
const char *strc_orig = strc;
const char *strc_end = strc + strc_maxlen;
while (true) {
size_t step = size_t(BLI_str_utf8_size_safe(strc));
if (!*strc || strc + step > strc_end) {
while (*strc) {
int step = BLI_str_utf8_size_safe(strc);
if (strc + step > strc_end) {
break;
}
/* Detect null bytes within multi-byte sequences.
* This matches the behavior of #BLI_strncpy_utf8 for incomplete byte sequences. */
for (int i = 1; i < step; i++) {
if (UNLIKELY(strc[i] == '\0')) {
step = i;
break;
}
}
strc += step;
len++;
}

60
source/blender/blenlib/tests/BLI_string_utf8_test.cc
View File

@@ -339,6 +339,66 @@ TEST(string, Utf8InvalidBytes)
/** \} */
/* -------------------------------------------------------------------- */
/** \name Test #BLI_strnlen_utf8
* \{ */
TEST(string, StringNLenUTF8)
{
EXPECT_EQ(BLI_strnlen_utf8("", 0), 0);
EXPECT_EQ(BLI_strnlen_utf8("", 1), 0);
EXPECT_EQ(BLI_strnlen_utf8(STR_MB_ALPHA_6, 6), 1);
}
TEST(string, StringNLenUTF8_Incomplete)
{
const char *ref_str =
STR_MB_ALPHA_1 STR_MB_ALPHA_2 STR_MB_ALPHA_3 STR_MB_ALPHA_4 STR_MB_ALPHA_5 STR_MB_ALPHA_6;
char buf[22];
const size_t ref_str_len = 21;
#define EXPECT_BYTE_OFFSET(truncate_ofs, expect_nchars) \
{ \
size_t buf_ofs = 0; \
strcpy(buf, ref_str); \
buf[truncate_ofs] = '\0'; \
EXPECT_EQ(BLI_strnlen_utf8_ex(buf, ref_str_len, &buf_ofs), expect_nchars); \
EXPECT_EQ(buf_ofs, truncate_ofs); \
}
EXPECT_BYTE_OFFSET(0, 0);
EXPECT_BYTE_OFFSET(1, 1);
EXPECT_BYTE_OFFSET(2, 2);
EXPECT_BYTE_OFFSET(3, 2);
EXPECT_BYTE_OFFSET(4, 3);
EXPECT_BYTE_OFFSET(5, 3);
EXPECT_BYTE_OFFSET(6, 3);
EXPECT_BYTE_OFFSET(7, 4);
EXPECT_BYTE_OFFSET(8, 4);
EXPECT_BYTE_OFFSET(9, 4);
EXPECT_BYTE_OFFSET(10, 4);
EXPECT_BYTE_OFFSET(11, 5);
EXPECT_BYTE_OFFSET(12, 5);
EXPECT_BYTE_OFFSET(13, 5);
EXPECT_BYTE_OFFSET(14, 5);
EXPECT_BYTE_OFFSET(15, 5);
EXPECT_BYTE_OFFSET(16, 6);
EXPECT_BYTE_OFFSET(17, 6);
EXPECT_BYTE_OFFSET(18, 6);
EXPECT_BYTE_OFFSET(19, 6);
EXPECT_BYTE_OFFSET(20, 6);
EXPECT_BYTE_OFFSET(21, 6);
#undef EXPECT_BYTE_OFFSET
}
/** \} */
/* -------------------------------------------------------------------- */
/** \name Test #BLI_strncpy_utf8
* \{ */