Merge pull request #17 from osch/master

avoid NULL as parameter to fputs()

5 files changed, 46 insertions, 0 deletions

diff --git a/.travis.yml b/.travis.yml
index 19f6f5b..1f52bf6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,6 +58,7 @@ script:
   - lua test_threads_attr.lua
   - lua test_integer.lua
   - lua test_interrupt.lua
+  - lua test_error.lua
   # - lua test_register_llthreads.lua
 
 notifications:
diff --git a/appveyor.yml b/appveyor.yml
index 46a3235..b405930 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -73,6 +73,7 @@ test_script:
   - lua test_threads_attr.lua
   - lua test_integer.lua
   - lua test_interrupt.lua
+  - lua test_error.lua
   # - lua test_register_llthreads.lua
 
 after_test:
diff --git a/lakefile b/lakefile
index af9661e..a5cb006 100644
--- a/lakefile
+++ b/lakefile
@@ -45,6 +45,7 @@ target('test', install, function()
   run_test('test_threads_ex_opt_2.lua')

   run_test('test_threads_attr.lua')

   run_test('test_interrupt.lua')

+  run_test('test_error.lua')

 

 

   if not test_summary() then

diff --git a/src/llthread.c b/src/llthread.c
index 66efe7c..a3b3216 100644
--- a/src/llthread.c
+++ b/src/llthread.c
@@ -132,6 +132,8 @@ static int fail(lua_State *L, const char *msg){
 void llthread_log(lua_State *L, const char *hdr, const char *msg){
   int top = lua_gettop(L);
   lua_rawgetp(L, LUA_REGISTRYINDEX, LLTHREAD_LOGGER_HOLDER);
+  if (!msg) 
+    msg = "(no error message)";
   if(lua_isnil(L, -1)){
     lua_pop(L, 1);
     fputs(hdr,  stderr);
diff --git a/test/test_error.lua b/test/test_error.lua
new file mode 100644
index 0000000..341105e
--- /dev/null
+++ b/test/test_error.lua
@@ -0,0 +1,41 @@
+local llthreads = require"llthreads"
+local utils     = require "utils"
+
+local include = utils.thread_init .. [[
+local llthreads = require"llthreads"
+]]
+
+do
+    local thread = llthreads.new(include .. [[
+      error({})
+    ]])
+    
+    thread:start()
+    local ok, err = thread:join()
+    print(ok, err)
+    assert(not ok)
+end
+do
+    local thread = llthreads.new(include .. [[
+      llthreads.set_logger(function(msg) print("XXX", msg) end)
+      error({})
+    ]])
+    
+    thread:start()
+    local ok, err = thread:join()
+    print(ok, err)
+    assert(not ok)
+end
+do
+    local thread = llthreads.new(include .. [[
+      llthreads.set_logger(function(msg) end)
+      error({})
+    ]])
+    
+    thread:start()
+    local ok, err = thread:join()
+    print(ok, err)
+    assert(not ok)
+end
+print("Done!")
+