mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-06 19:38:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

6
src/stdlib/SDL_string.c
View File

@@ -860,11 +860,14 @@ 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 bytes = 0;
if (dst_bytes > 0) {
size_t src_bytes = SDL_strlen(src); size_t src_bytes = SDL_strlen(src);
size_t bytes = SDL_min(src_bytes, dst_bytes - 1);
size_t i = 0; size_t i = 0;
size_t trailing_bytes = 0; size_t trailing_bytes = 0;
bytes = SDL_min(src_bytes, dst_bytes - 1);
if (bytes) { if (bytes) {
unsigned char c = (unsigned char)src[bytes - 1]; unsigned char c = (unsigned char)src[bytes - 1];
if (UTF8_IsLeadByte(c)) { if (UTF8_IsLeadByte(c)) {
@@ -885,6 +888,7 @@ size_t SDL_utf8strlcpy(SDL_OUT_Z_CAP(dst_bytes) char *dst, const char *src, size
SDL_memcpy(dst, src, bytes); SDL_memcpy(dst, src, bytes);
} }
dst[bytes] = '\0'; dst[bytes] = '\0';
}
return bytes; return bytes;
} }