From 76be2e91e5f69b61077c8287331319097529492c Mon Sep 17 00:00:00 2001
From: "florent.teppe" <florent.teppe@nadeo.com>
Date: Sat, 18 Sep 2021 18:25:04 +0200
Subject: [PATCH] Fixed an issue where keyword search expected the text to be
 all ASCII characters

---
 apps/openmw/mwdialogue/keywordsearch.hpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwdialogue/keywordsearch.hpp b/apps/openmw/mwdialogue/keywordsearch.hpp
index f296f223fb..3cd8517651 100644
--- a/apps/openmw/mwdialogue/keywordsearch.hpp
+++ b/apps/openmw/mwdialogue/keywordsearch.hpp
@@ -68,6 +68,19 @@ public:
         return false;
     }
 
+    static bool isWhitespaceUTF8(const int utf8Char)
+    {
+        if (utf8Char >= 0 && utf8Char <= UCHAR_MAX)
+        {
+            //That function has undefined behavior if the character doesn't fit in unsigned char
+            return std::isspace(utf8Char);
+        }
+        else
+        {
+            return false;
+        }
+    }
+
     static bool sortMatches(const Match& left, const Match& right)
     {
         return left.mBeg < right.mBeg;
@@ -83,7 +96,7 @@ public:
             {
                 Point prev = i;
                 --prev;
-                if(isalpha(*prev))
+                if(!isWhitespaceUTF8(*prev))
                     continue;
             }