summaryrefslogtreecommitdiff
path: root/src/nodedef.cpp
diff options
context:
space:
mode:
authorjuhdanad <juhdanad@gmail.com>2016-11-28 09:43:33 +0100
committerZeno- <kde.psych@gmail.com>2016-11-28 18:43:33 +1000
commit2fe3bf5a18eb9aa9f38654b3c0a0729c42408cd6 (patch)
treeafccb5b126b0ca34694ad9e8052a85f6f1a44b7f /src/nodedef.cpp
parentbb06d377a163b2d168c9d327ad38b871132fa8ea (diff)
downloadminetest-2fe3bf5a18eb9aa9f38654b3c0a0729c42408cd6.tar.gz
minetest-2fe3bf5a18eb9aa9f38654b3c0a0729c42408cd6.tar.bz2
minetest-2fe3bf5a18eb9aa9f38654b3c0a0729c42408cd6.zip
Limit light_source in the engine (#4814)
Since light_source>15 causes crash, it must be limited.
Diffstat (limited to 'src/nodedef.cpp')
-rw-r--r--src/nodedef.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index 39ea1a60e..ccbb42c66 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -482,6 +482,7 @@ void ContentFeatures::deSerialize(std::istream &is)
liquid_viscosity = readU8(is);
liquid_renewable = readU8(is);
light_source = readU8(is);
+ light_source = MYMIN(light_source, LIGHT_MAX);
damage_per_second = readU32(is);
node_box.deSerialize(is);
selection_box.deSerialize(is);
@@ -1442,6 +1443,7 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version)
liquid_alternative_source = deSerializeString(is);
liquid_viscosity = readU8(is);
light_source = readU8(is);
+ light_source = MYMIN(light_source, LIGHT_MAX);
damage_per_second = readU32(is);
node_box.deSerialize(is);
selection_box.deSerialize(is);