From 2da9ed455660f4898e13ee350ff59f38864e1072 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Fri, 5 Feb 2021 11:55:21 +0100
Subject: [PATCH] Fix crash when using Find/FindLast on empty String

---
 Source/Engine/Core/Types/String.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Engine/Core/Types/String.h b/Source/Engine/Core/Types/String.h
index 4d1ef4e7f..cf21a1236 100644
--- a/Source/Engine/Core/Types/String.h
+++ b/Source/Engine/Core/Types/String.h
@@ -220,7 +220,7 @@ public:
     /// <returns>The index of the found substring or -1 if not found.</returns>
     int32 Find(const T* subStr, StringSearchCase searchCase = StringSearchCase::CaseSensitive, int32 startPosition = -1) const
     {
-        if (subStr == nullptr)
+        if (subStr == nullptr || !_data)
             return -1;
         const T* start = _data;
         if (startPosition != -1)
@@ -241,7 +241,7 @@ public:
     int32 FindLast(const T* subStr, StringSearchCase searchCase = StringSearchCase::CaseSensitive, int32 startPosition = -1) const
     {
         const int32 subStrLen = StringUtils::Length(subStr);
-        if (subStrLen == 0)
+        if (subStrLen == 0 || !_data)
             return -1;
         if (startPosition == -1)
             startPosition = Length();