Fix possible crash on ThreadMgr creation

ryancheung · Sep 9, 2020 · 12dfdec · 12dfdec
1 parent 93de3c9
commit 12dfdec
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/ImeSharp/TextServicesContext.cs b/ImeSharp/TextServicesContext.cs
@@ -204,10 +204,17 @@ public ITfThreadMgrEx ThreadManager
             {
                 if (_threadManager == null)
                 {
-                    ITfThreadMgr threadMgr;
-                    Tsf.GetThreadMgr(out threadMgr);
+                    ITfThreadMgr threadMgr = null;
+                    try
+                    {
+                        // This might fail
+                        Tsf.GetThreadMgr(out threadMgr);
+                    }
+                    catch (SharpGen.Runtime.SharpGenException)
+                    {
+                    }
 
-                    // Dispose previous ITfThreadMgr in case something weird happens 
+                    // Dispose previous ITfThreadMgr in case something weird happens
                     if (threadMgr != null)
                     {
                         if (threadMgr.IsThreadFocus)