From 70b0fad25a0e35ddcbf4b83d3efcdf861ee2c8f3 Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Mon, 18 Nov 2019 21:51:54 +0100 Subject: [PATCH] Fix Visual Studio throwing C4996 warning in ustring.cpp. --- core/ustring.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/ustring.cpp b/core/ustring.cpp index 0f82ca7e15..d115ab7ae7 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -142,9 +142,11 @@ void CharString::copy_from(const char *p_cstr) { return; } - resize(len + 1); // include terminating null char + Error err = resize(++len); // include terminating null char - strcpy(ptrw(), p_cstr); + ERR_FAIL_COND_MSG(err != OK, "Failed to copy C-string."); + + memcpy(ptrw(), p_cstr, len); } void String::copy_from(const char *p_cstr) {