Merge pull request #2043 from joto/fix-double-to-uint

Fix architecture-dependent double to integer conversion

Author: lonvia

src/flex-lua-expire-output.cpp

@@ -46,25 +46,19 @@ create_expire_output(lua_State *lua_state, std::string const &default_schema,
     }
 
     // required "maxzoom" field
-    auto value = luaX_get_table_optional_uint32(
-        lua_state, "maxzoom", -1, "The 'maxzoom' field in a expire output");
-    if (value >= 1 && value <= 20) {
-        new_expire_output.set_minzoom(value);
-        new_expire_output.set_maxzoom(value);
-    } else {
-        throw std::runtime_error{
-            "Value of 'maxzoom' field must be between 1 and 20."};
-    }
+    auto const maxzoom = luaX_get_table_optional_uint32(
+        lua_state, "maxzoom", -1, "The 'maxzoom' field in a expire output", 1,
+        20, "1 and 20");
+    new_expire_output.set_minzoom(maxzoom);
+    new_expire_output.set_maxzoom(maxzoom);
     lua_pop(lua_state, 1); // "maxzoom"
 
     // optional "minzoom" field
-    value = luaX_get_table_optional_uint32(
-        lua_state, "minzoom", -1, "The 'minzoom' field in a expire output");
-    if (value >= 1 && value <= new_expire_output.maxzoom()) {
-        new_expire_output.set_minzoom(value);
-    } else if (value != 0) {
-        throw std::runtime_error{
-            "Value of 'minzoom' field must be between 1 and 'maxzoom'."};
+    auto const minzoom = luaX_get_table_optional_uint32(
+        lua_state, "minzoom", -1, "The 'minzoom' field in a expire output", 1,
+        maxzoom, "1 and 'maxzoom'");
+    if (minzoom > 0) {
+        new_expire_output.set_minzoom(minzoom);
     }
     lua_pop(lua_state, 1); // "minzoom"
 

src/lua-utils.cpp

@@ -160,7 +160,9 @@ bool luaX_get_table_bool(lua_State *lua_state, char const *key, int table_index,
 }
 
 uint32_t luaX_get_table_optional_uint32(lua_State *lua_state, char const *key,
-                                        int table_index, char const *error_msg)
+                                        int table_index, char const *error_msg,
+                                        uint32_t min, uint32_t max,
+                                        char const *range)
 {
     assert(lua_state);
     assert(key);
@@ -172,7 +174,13 @@ uint32_t luaX_get_table_optional_uint32(lua_State *lua_state, char const *key,
     if (!lua_isnumber(lua_state, -1)) {
         throw fmt_error("{} must contain an integer.", error_msg);
     }
-    return lua_tonumber(lua_state, -1);
+
+    auto const num = lua_tonumber(lua_state, -1);
+    if (num < static_cast<double>(min) || num > static_cast<double>(max)) {
+        throw fmt_error("{} must be between {}.", error_msg, range);
+    }
+
+    return static_cast<uint32_t>(num);
 }
 
 // Lua 5.1 doesn't support luaL_traceback, unless LuaJIT is used

src/lua-utils.hpp

@@ -58,7 +58,9 @@ char const *luaX_get_table_string(lua_State *lua_state, char const *key,
                                   char const *default_value);
 
 uint32_t luaX_get_table_optional_uint32(lua_State *lua_state, char const *key,
-                                        int table_index, char const *error_msg);
+                                        int table_index, char const *error_msg,
+                                        uint32_t min, uint32_t max,
+                                        char const *range);
 
 bool luaX_get_table_bool(lua_State *lua_state, char const *key, int table_index,
                          char const *error_msg, bool default_value);

tests/bdd/flex/lua-expire-output-definitions.feature

@@ -104,7 +104,7 @@ Feature: Expire output definitions in Lua file
         Then running osm2pgsql flex fails
         And the error output contains
             """
-            Value of 'maxzoom' field must be between 1 and 20.
+            The 'maxzoom' field in a expire output must be between 1 and 20.
             """
 
     Scenario: Minzoom value in expire output definition has to be in range
@@ -121,7 +121,7 @@ Feature: Expire output definitions in Lua file
         Then running osm2pgsql flex fails
         And the error output contains
             """
-            Value of 'minzoom' field must be between 1 and 'maxzoom'.
+            The 'minzoom' field in a expire output must be between 1 and 'maxzoom'.
             """
 
     Scenario: Minzoom value in expire output definition has to be smaller than maxzoom
@@ -138,6 +138,6 @@ Feature: Expire output definitions in Lua file
         Then running osm2pgsql flex fails
         And the error output contains
             """
-            Value of 'minzoom' field must be between 1 and 'maxzoom'.
+            The 'minzoom' field in a expire output must be between 1 and 'maxzoom'.
             """