From 28f53339e77acaaed0c1a61c5c6a114a034fb2b2 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 2 Feb 2021 23:33:42 +0100
Subject: [PATCH] Fix crash when loading string property in json that is not a
 string

Fixes #178
---
 Source/ThirdParty/rapidjson/document.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Source/ThirdParty/rapidjson/document.h b/Source/ThirdParty/rapidjson/document.h
index d9472ec1e..2691a6386 100644
--- a/Source/ThirdParty/rapidjson/document.h
+++ b/Source/ThirdParty/rapidjson/document.h
@@ -1679,7 +1679,18 @@ public:
     //@{
 
     const Ch* GetString() const { RAPIDJSON_ASSERT(IsString()); return (data_.f.flags & kInlineStrFlag) ? data_.ss.str : GetStringPointer(); }
-	::String GetText() const { RAPIDJSON_ASSERT(IsString()); return ::String(GetString(), GetStringLength()); }
+	::String GetText() const
+    {
+        ::String result;
+        if (IsString())
+        {
+            if (data_.f.flags & kInlineStrFlag)
+                result.Set(data_.ss.str, data_.ss.GetLength());
+            else
+                result.Set(GetStringPointer(), data_.s.length);
+        }
+        return result;
+    }
 
     //! Get the length of string.
     /*! Since rapidjson permits "\\u0000" in the json string, strlen(v.GetString()) may not equal to v.GetStringLength().