From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 10 Mar 2017 09:48:46 +0000 (+0100)
Subject: LuaWrapper: Allow embedded NULs in strings received from Lua
X-Git-Tag: rec-4.0.5-rc1~1^2~8^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ffdd813a64e642f9407e379baa498ec13a683a8e;p=pdns

LuaWrapper: Allow embedded NULs in strings received from Lua

(cherry picked from commit 448990ab9bd7355f42ff8752a973aff20bdaf4e7)
---

diff --git a/ext/luawrapper/include/LuaContext.hpp b/ext/luawrapper/include/LuaContext.hpp
index 2d30d1d46..91e3a3edb 100644
--- a/ext/luawrapper/include/LuaContext.hpp
+++ b/ext/luawrapper/include/LuaContext.hpp
@@ -2486,10 +2486,11 @@ struct LuaContext::Reader<std::string>
     static auto read(lua_State* state, int index)
         -> boost::optional<std::string>
     {
-        const auto val = lua_tostring(state, index);
+        size_t len;
+        const auto val = lua_tolstring(state, index, &len);
         if (val == 0)
             return boost::none;
-        return std::string(val);
+        return std::string(val, len);
     }
 };