Fix error with LuaJIT when ffi package isn't required

4 files changed, 9 insertions, 5 deletions

diff --git a/CHANGES b/CHANGES
index a1311ce..998a87a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 CHANGES:
 
+CHANGE 129: BGe 2-Nov-18
+   * Bumped version to 3.13
+   * fix error when autodetecting protect_allocator when running under LuaJIT
+
 CHANGE 128: BGe 31-Oct-18
    * Better default value autodetection for protect_allocator setting
 
diff --git a/docs/index.html b/docs/index.html
index ff4b7a0..7b9b6ce 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -64,13 +64,13 @@
                 <font size="-1">
                         <p>
                                 <br/>
-                                <i>Copyright &copy; 2007-17 Asko Kauppi, Benoit Germain. All rights reserved.</i>
+                                <i>Copyright &copy; 2007-18 Asko Kauppi, Benoit Germain. All rights reserved.</i>
                                 <br/>
                                 Lua Lanes is published under the same <a href="http://en.wikipedia.org/wiki/MIT_License">MIT license</a> as Lua 5.1, 5.2, and 5.3.
                         </p>
 
                         <p>
-                                This document was revised on 1-Aug-17, and applies to version <tt>3.12</tt>.
+                                This document was revised on 2-Nov-18, and applies to version <tt>3.13</tt>.
                         </p>
                 </font>
         </center>
@@ -324,7 +324,7 @@
                                 <tt>nil</tt>/<tt>false</tt>/<tt>true</tt>
                         </td>
                         <td>
-                                (Since v3.5.2) If equal to <tt>true</tt>, Lanes wraps all calls to the state's allocator function inside a mutex. Useful when running Lanes with LuaJIT, whose allocator is not threadsafe.
+                                (Since v3.5.2) If equal to <tt>true</tt>, Lanes wraps all calls to the state's allocator function inside a mutex. Lanes autodetects this value for LuaJIT (the guess might be wrong if <tt>"ffi"</tt> isn't loaded though).
                                 Default is <tt>true</tt> when Lanes detects it is run by LuaJIT, else <tt>nil</tt>.
                         </td>
                 </tr>
diff --git a/src/lanes.c b/src/lanes.c
index b89e3f5..f2e7927 100644
--- a/src/lanes.c
+++ b/src/lanes.c
@@ -52,7 +52,7 @@
  *      ...
  */
 
-char const* VERSION = "3.12";
+char const* VERSION = "3.13";
 
 /*
 ===============================================================================
diff --git a/src/lanes.lua b/src/lanes.lua
index 54fa0ac..b82ae2a 100644
--- a/src/lanes.lua
+++ b/src/lanes.lua
@@ -77,7 +77,7 @@ lanes.configure = function( settings_)
                 demote_full_userdata = nil,
                 verbose_errors = false,
                 -- LuaJIT provides a thread-unsafe allocator by default, so we need to protect it when used in parallel lanes
-                protect_allocator = (package.loaded.jit and jit.version and (package.loaded.ffi.abi( "32bit") or package.loaded.ffi.abi( "gc64"))) and true or false
+                protect_allocator = (package.loaded.jit and jit.version and package.loaded.ffi and (package.loaded.ffi.abi( "32bit") or package.loaded.ffi.abi( "gc64"))) and true or false
         }
         local boolean_param_checker = function( val_)
                 -- non-'boolean-false' should be 'boolean-true' or nil