From 32a73f9eb2dc1326e8dfeb984cede773553798f6 Mon Sep 17 00:00:00 2001 From: LuisAntonRebollo Date: Sun, 11 May 2014 19:46:43 +0200 Subject: [PATCH] Fix Dereference of null pointer on String::operator+=. --- Engine/source/core/util/str.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine/source/core/util/str.cpp b/Engine/source/core/util/str.cpp index 9a89ef2a1..7d50f33ee 100644 --- a/Engine/source/core/util/str.cpp +++ b/Engine/source/core/util/str.cpp @@ -760,7 +760,7 @@ String& String::operator=(const String &src) String& String::operator+=(const StringChar *src) { - if( src == NULL && !*src ) + if( src == NULL || !*src ) return *this; // Append the given string into a new string