2 files changed, 4 insertions, 4 deletions
diff --git a/core/fxcrt/fx_arabic.cpp b/core/fxcrt/fx_arabic.cpp
index 79d6be2346..095db8d728 100644
--- a/core/fxcrt/fx_arabic.cpp
+++ b/core/fxcrt/fx_arabic.cpp
@@ -667,9 +667,9 @@ namespace pdfium {
 namespace arabic {
 
 wchar_t GetFormChar(wchar_t wch, wchar_t prev, wchar_t next) {
-  CFX_Char c(wch, kTextLayoutCodeProperties[static_cast<uint16_t>(wch)]);
-  CFX_Char p(prev, kTextLayoutCodeProperties[static_cast<uint16_t>(prev)]);
-  CFX_Char n(next, kTextLayoutCodeProperties[static_cast<uint16_t>(next)]);
+  CFX_Char c(wch, FX_GetUnicodeProperties(wch));
+  CFX_Char p(prev, FX_GetUnicodeProperties(prev));
+  CFX_Char n(next, FX_GetUnicodeProperties(next));
   return GetFormChar(&c, &p, &n);
 }
 
diff --git a/core/fxcrt/fx_unicode.cpp b/core/fxcrt/fx_unicode.cpp
index 595bb65a63..f23200491a 100644
--- a/core/fxcrt/fx_unicode.cpp
+++ b/core/fxcrt/fx_unicode.cpp
@@ -24,7 +24,7 @@ wchar_t GetMirrorChar(wchar_t wch, uint32_t dwProps) {
 uint32_t FX_GetUnicodeProperties(wchar_t wch) {
   size_t idx = static_cast<size_t>(wch);
   if (idx < kTextLayoutCodePropertiesSize)
-    return kTextLayoutCodeProperties[(uint16_t)wch];
+    return kTextLayoutCodeProperties[idx];
   return 0;
 }