Merge branch 'development' into cmake/AddressSanitizer

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-17 10:43:37 -07:00
parent 964c2401df fa2fc03a25
commit 3e06307461
113 changed files with 2338 additions and 2205 deletions
@@ -851,7 +851,8 @@ bool CLog::LogToMainThread(const char* szString, ELogType logType, bool bAdd, SL
    {
        // When logging from other thread then main, push all log strings to queue.
        SLogMsg msg;
-        azstrcpy(msg.msg, AZ_ARRAY_SIZE(msg.msg), szString);
+        constexpr size_t maxArraySize = AZ_ARRAY_SIZE(msg.msg);
+        azstrncpy(msg.msg, maxArraySize, szString, maxArraySize - 1);
        msg.bAdd = bAdd;
        msg.destination = destination;
        msg.logType = logType;