mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-06-04 10:57:40 +00:00
Fixed calling SDL_utf8strlcpy() with dst_bytes of 0
This commit is contained in:
parent
668e2f82d2
commit
80e541d1fc
1 changed files with 27 additions and 23 deletions
|
@ -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 bytes = 0;
|
||||
|
||||
if (dst_bytes > 0) {
|
||||
size_t src_bytes = SDL_strlen(src);
|
||||
size_t bytes = SDL_min(src_bytes, dst_bytes - 1);
|
||||
size_t i = 0;
|
||||
size_t trailing_bytes = 0;
|
||||
|
||||
bytes = SDL_min(src_bytes, dst_bytes - 1);
|
||||
if (bytes) {
|
||||
unsigned char c = (unsigned char)src[bytes - 1];
|
||||
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);
|
||||
}
|
||||
dst[bytes] = '\0';
|
||||
}
|
||||
|
||||
return bytes;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue