eden-emu/SDL
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fixed calling SDL_utf8strlcpy() with dst_bytes of 0

Browse source
This commit is contained in:
Sam Lantinga 2024-09-09 10:41:49 -07:00
parent 668e2f82d2
commit 80e541d1fc
1 changed files with 27 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/stdlib/SDL_string.c
View file

@ -860,31 +860,35 @@ size_t SDL_strlcpy(SDL_OUT_Z_CAP(maxlen) char *dst, const char *src, size_t maxl
size_t SDL_utf8strlcpy(SDL_OUT_Z_CAP(dst_bytes) char *dst, const char *src, size_t dst_bytes) size_t SDL_utf8strlcpy(SDL_OUT_Z_CAP(dst_bytes) char *dst, const char *src, size_t dst_bytes)
{ {
size_t src_bytes = SDL_strlen(src); size_t bytes = 0;
size_t bytes = SDL_min(src_bytes, dst_bytes - 1);
size_t i = 0;
size_t trailing_bytes = 0;
if (bytes) { if (dst_bytes > 0) {
unsigned char c = (unsigned char)src[bytes - 1]; size_t src_bytes = SDL_strlen(src);
if (UTF8_IsLeadByte(c)) { size_t i = 0;
--bytes; size_t trailing_bytes = 0;
} else if (UTF8_IsTrailingByte(c)) {
for (i = bytes - 1; i != 0; --i) {
c = (unsigned char)src[i];
trailing_bytes = UTF8_GetTrailingBytes(c);
if (trailing_bytes) {
if ((bytes - i) != (trailing_bytes + 1)) {
bytes = i;
}
break; bytes = SDL_min(src_bytes, dst_bytes - 1);
} if (bytes) {
} unsigned char c = (unsigned char)src[bytes - 1];
} if (UTF8_IsLeadByte(c)) {
SDL_memcpy(dst, src, bytes); --bytes;
} } else if (UTF8_IsTrailingByte(c)) {
dst[bytes] = '\0'; for (i = bytes - 1; i != 0; --i) {
c = (unsigned char)src[i];
trailing_bytes = UTF8_GetTrailingBytes(c);
if (trailing_bytes) {
if ((bytes - i) != (trailing_bytes + 1)) {
bytes = i;
}
break;
}
}
}
SDL_memcpy(dst, src, bytes);
}
dst[bytes] = '\0';
}
return bytes; return bytes;
} }