Browse Source

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

Fix Visual Studio throwing C4996 warning in ustring.cpp.
Rémi Verschelde 5 years ago
parent
commit
0b4b24883d
1 changed files with 4 additions and 2 deletions
  1. 4 2
      core/ustring.cpp

+ 4 - 2
core/ustring.cpp

@@ -146,9 +146,11 @@ void CharString::copy_from(const char *p_cstr) {
 		return;
 		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) {
 void String::copy_from(const char *p_cstr) {