Merge pull request #13 from danipen/sync-create-regex

Sync create oniguruma regex
danipen · Feb 18, 2022 · bd074b7 · bd074b7
2 parents 5784411 + 17d9a8a
commit bd074b7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -377,3 +377,7 @@ onigwrap/src/libonigwrap.so
 .idea/.idea.TextMateSharp.dir/.idea/encodings.xml
 .idea/.idea.TextMateSharp.dir/.idea/indexLayout.xml
 .idea/.idea.TextMateSharp.dir/.idea/vcs.xml
+onigwrap/src/onigwrap.lib
+onigwrap/src/onigwrap.exp
+onigwrap/src/onigwrap.dll
+onigwrap/src/onig_s.lib
diff --git a/src/TextMateSharp/Internal/Oniguruma/ORegex.cs b/src/TextMateSharp/Internal/Oniguruma/ORegex.cs
@@ -6,6 +6,8 @@ namespace TextMateSharp.Internal.Oniguruma
 {
     public class ORegex : IDisposable
     {
+        private static object _createRegexSync = new object();
+
         private IntPtr _regex;
         private IntPtr _region;
         private bool _disposed = false;
@@ -28,13 +30,16 @@ public unsafe ORegex(string pattern, bool ignoreCase = true, bool multiline = fa
             pattern = UnicodeCharEscape.AddBracesToUnicodePatterns(pattern);
             pattern = UnicodeCharEscape.ConstraintUnicodePatternLenght(pattern);
 
-            fixed (char* patternPtr = pattern)
+            lock (_createRegexSync)
             {
-                _regex = OnigInterop.onigwrap_create(
-                    patternPtr,
-                    Encoding.Unicode.GetByteCount(patternPtr, pattern.Length),
-                    ignoreCaseArg,
-                    multilineArg);
+                fixed (char* patternPtr = pattern)
+                {
+                    _regex = OnigInterop.onigwrap_create(
+                        patternPtr,
+                        Encoding.Unicode.GetByteCount(patternPtr, pattern.Length),
+                        ignoreCaseArg,
+                        multilineArg);
+                }
             }
 
             if (!Valid)