From 82881d6b038c10906704f5e53819051d2a9b6a5a Mon Sep 17 00:00:00 2001 From: pavel-t <36256989+pavel-t@users.noreply.github.com> Date: Thu, 12 Jul 2018 12:19:07 +0300 Subject: [PATCH] Use memcpy instead of strncpy in wxStrlcpy Avoid stringop-overflow warning about strncpy size argument depending on source size. Checking for null in src is not needed because it is already checked by strlen. --- include/wx/wxcrt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h index 2cbd853ecf..1a3e5e0dbf 100644 --- a/include/wx/wxcrt.h +++ b/include/wx/wxcrt.h @@ -257,7 +257,7 @@ inline size_t wxStrlcpy(char *dest, const char *src, size_t n) { if ( n-- > len ) n = len; - wxCRT_StrncpyA(dest, src, n); + wxTmemcpy(dest, src, n); dest[n] = '\0'; } @@ -270,7 +270,7 @@ inline size_t wxStrlcpy(wchar_t *dest, const wchar_t *src, size_t n) { if ( n-- > len ) n = len; - wxCRT_StrncpyW(dest, src, n); + wxTmemcpy(dest, src, n); dest[n] = L'\0'; }