Merge pull request #33731 from madmiraal/fix-c4996-warning

Fix Visual Studio throwing C4996 warning in ustring.cpp.
godotengine · Feb 11, 2020 · 0b4b248 · 0b4b248
2 parents 6fb6405 + 70b0fad
commit 0b4b248
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/core/ustring.cpp b/core/ustring.cpp
@@ -146,9 +146,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) {