From fbcc79dcd054f8100a32d27511d1d23bbe4d60e5 Mon Sep 17 00:00:00 2001 From: Ben Payne Date: Tue, 17 Mar 2015 10:56:41 -0400 Subject: [PATCH] Don't call strlen on data that might not be null-terminated --- Engine/source/core/util/str.cpp | 1 - Engine/source/core/util/str.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Engine/source/core/util/str.cpp b/Engine/source/core/util/str.cpp index d9d3c3ec7..501ef0c10 100644 --- a/Engine/source/core/util/str.cpp +++ b/Engine/source/core/util/str.cpp @@ -567,7 +567,6 @@ String::String(const StringChar *str, SizeType len) PROFILE_SCOPE(String_char_len_constructor); if (str && *str && len!=0) { - AssertFatal(len<=dStrlen(str), "String::String: string too short"); _string = new ( len ) StringData( str ); } else diff --git a/Engine/source/core/util/str.h b/Engine/source/core/util/str.h index 009484451..b96f0e2ab 100644 --- a/Engine/source/core/util/str.h +++ b/Engine/source/core/util/str.h @@ -62,7 +62,7 @@ public: String(); String(const String &str); String(const StringChar *str); - String(const StringChar *str, SizeType size); + String(const StringChar *str, SizeType size); ///< Copy from raw data String(const UTF16 *str); ~String();