aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Martinez <kaeza@users.sf.net>2016-02-04 09:58:44 -0300
committerest31 <MTest31@outlook.com>2016-02-08 01:55:02 +0100
commit430195381d8d7254a7b8cdcf6b50769c2c598329 (patch)
tree85ec4954e87f407c38670ce37df2dd53c7ea9f64
parent16c70087711db38ac40a428c64623355b8e7691b (diff)
downloadminetest-430195381d8d7254a7b8cdcf6b50769c2c598329.tar.gz
minetest-430195381d8d7254a7b8cdcf6b50769c2c598329.tar.bz2
minetest-430195381d8d7254a7b8cdcf6b50769c2c598329.zip
builtin: Fix `print` crashing on nil "holes".
The engine implementation of `print` packs the varargs into a table and passes the table directly to `table.concat`. If you pass any value not supported by `table.concat` (particularly `nil`), the server crashes. This is unexpected behavior, as `print` is supposed to be able to work with anything. This patch changes the implementation so it first converts all arguments using `tostring`, which fixes the issue and makes the custom `print` function compatible with the stock Lua behavior.
-rw-r--r--builtin/init.lua6
1 files changed, 5 insertions, 1 deletions
diff --git a/builtin/init.lua b/builtin/init.lua
index b3004468e..6b27cf76e 100644
--- a/builtin/init.lua
+++ b/builtin/init.lua
@@ -12,7 +12,11 @@ if core.print then
-- Override native print and use
-- terminal if that's turned on
function print(...)
- core_print(table.concat({...}, "\t"))
+ local n, t = select("#", ...), { ... }
+ for i = 1, n do
+ t[i] = tostring(t[i])
+ end
+ core_print(table.concat(t, "\t"))
end
core.print = nil -- don't pollute our namespace
end