1 files changed, 22 insertions, 5 deletions

diff --git a/src/linda.c b/src/linda.c
index 21b38fe..4149e71 100644
--- a/src/linda.c
+++ b/src/linda.c
@@ -758,9 +758,6 @@ LUAG_FUNC( linda_towatch)
 */
 static void* linda_id( lua_State* L, DeepOp op_)
 {
-    Universe* const U = universe_get(L);
-    AllocatorDefinition* const allocD = &U->protected_allocator.definition;
-
     switch( op_)
     {
         case eDO_new:
@@ -797,7 +794,17 @@ static void* linda_id( lua_State* L, DeepOp op_)
             * One can use any memory allocation scheme.
             * just don't use L's allocF because we don't know which state will get the honor of GCing the linda
             */
-            s = (struct s_Linda*) allocD->allocF( allocD->allocUD, NULL, 0, sizeof(struct s_Linda) + name_len); // terminating 0 is already included
+            // don't hijack the state allocator when running LuaJIT because it looks like LuaJIT does not expect it and might invalidate the memory unexpectedly
+#if LUAJIT_FLAVOR == 0
+            {
+                Universe* const U = universe_get(L);
+                AllocatorDefinition* const allocD = &U->protected_allocator.definition;
+
+                s = (struct s_Linda*)allocD->allocF(allocD->allocUD, NULL, 0, sizeof(struct s_Linda) + name_len); // terminating 0 is already included
+            }
+#else // LUAJIT_FLAVOR
+            s = (struct s_Linda*)malloc(sizeof(struct s_Linda) + name_len); // terminating 0 is already included
+#endif // LUAJIT_FLAVOR
             if( s)
             {
                 s->prelude.magic.value = DEEP_VERSION.value;
@@ -830,7 +837,17 @@ static void* linda_id( lua_State* L, DeepOp op_)
             // There aren't any lanes waiting on these lindas, since all proxies have been gc'ed. Right?
             SIGNAL_FREE( &linda->read_happened);
             SIGNAL_FREE( &linda->write_happened);
-            allocD->allocF( allocD->allocUD, linda, sizeof(struct s_Linda) + strlen(linda->name), 0);
+            // don't hijack the state allocator when running LuaJIT because it looks like LuaJIT does not expect it and might invalidate the memory unexpectedly
+#if LUAJIT_FLAVOR == 0
+            {
+                Universe* const U = universe_get(L);
+                AllocatorDefinition* const allocD = &U->protected_allocator.definition;
+
+                allocD->allocF(allocD->allocUD, linda, sizeof(struct s_Linda) + strlen(linda->name), 0);
+            }
+#else // LUAJIT_FLAVOR
+            free(linda);
+#endif // LUAJIT_FLAVOR
             return NULL;
         }