Fix segfault when using LuaJIT

joto · joto · commit 280db8c06f8a · 2020-02-08T22:20:09.000+01:00
For some reason LuaJIT doesn't like the "noexcept" on our trampoline function. Fixes #1070.
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
@@ -42,7 +42,7 @@ static std::mutex lua_mutex;
 // context (the output_flex_t object) and call the respective function on the
 // context object.
 #define TRAMPOLINE(func_name, lua_name)                                        \
-    static int lua_trampoline_##func_name(lua_State *lua_state) noexcept       \
+    static int lua_trampoline_##func_name(lua_State *lua_state)                \
     {                                                                          \
         try {                                                                  \
             return static_cast<output_flex_t *>(luaX_get_context(lua_state))   \
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -73,6 +73,7 @@ if (HAVE_LUA)
     set_test(test-output-flex-area)
     set_test(test-output-flex-attr)
     set_test(test-output-flex-extra)
+    set_test(test-output-flex-lua-fail)
     set_test(test-output-flex-uni)
     set_test(test-output-flex-tablespace LABELS Tablespace)
     set_test(test-output-flex-update)
diff --git a/tests/data/test_output_flex_fail.lua b/tests/data/test_output_flex_fail.lua
@@ -0,0 +1,36 @@
+
+local table = osm2pgsql.define_table{
+    name = 'osm2pgsql_test_polygon',
+    ids = { type = 'area', id_column = 'osm_id' },
+    columns = {
+        { column = 'tags', type = 'hstore' },
+        { column = 'name', type = 'text' },
+        { column = 'geom', type = 'geometry' },
+        { column = 'area', type = 'area' },
+    }
+}
+
+function is_empty(some_table)
+    return next(some_table) == nil
+end
+
+function clean_tags(tags)
+    tags.odbl = nil
+    tags.created_by = nil
+    tags.source = nil
+    tags['source:ref'] = nil
+    tags['source:name'] = nil
+end
+
+function osm2pgsql.process_way(data)
+    clean_tags(data.tags)
+    if is_empty(data.tags) then
+        return
+    end
+
+    table:add_row({
+        tags = data.tags,
+        name = data.tags.name,
+    })
+end
+
diff --git a/tests/test-output-flex-lua-fail.cpp b/tests/test-output-flex-lua-fail.cpp
@@ -0,0 +1,14 @@
+#include <catch.hpp>
+
+#include "common-import.hpp"
+#include "common-options.hpp"
+
+static testing::db::import_t db;
+
+TEST_CASE("error in lua file")
+{
+    REQUIRE_THROWS(
+        db.run_file(testing::opt_t().slim().flex("test_output_flex_fail.lua"),
+                    "liechtenstein-2013-08-03.osm.pbf"));
+}
+
