Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 10:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Limit light_source in the engine (#4814)

Browse Source 
Since light_source>15 causes crash, it must be limited.
This commit is contained in:
juhdanad 2016-11-28 09:43:33 +01:00 committed by Zeno-
parent bb06d377a1
commit 2fe3bf5a18
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nodedef.cpp
View File

@ -482,6 +482,7 @@ void ContentFeatures::deSerialize(std::istream &is)
liquid_viscosity = readU8(is); liquid_viscosity = readU8(is);
liquid_renewable = readU8(is); liquid_renewable = readU8(is);
light_source = readU8(is); light_source = readU8(is);
light_source = MYMIN(light_source, LIGHT_MAX);
damage_per_second = readU32(is); damage_per_second = readU32(is);
node_box.deSerialize(is); node_box.deSerialize(is);
selection_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_alternative_source = deSerializeString(is);
liquid_viscosity = readU8(is); liquid_viscosity = readU8(is);
light_source = readU8(is); light_source = readU8(is);
light_source = MYMIN(light_source, LIGHT_MAX);
damage_per_second = readU32(is); damage_per_second = readU32(is);
node_box.deSerialize(is); node_box.deSerialize(is);
selection_box.deSerialize(is); selection_box.deSerialize(is);

6
src/script/common/c_content.cpp
View File

@ -526,6 +526,12 @@ ContentFeatures read_content_features(lua_State *L, int index)
// Amount of light the node emits // Amount of light the node emits
f.light_source = getintfield_default(L, index, f.light_source = getintfield_default(L, index,
"light_source", f.light_source); "light_source", f.light_source);
if (f.light_source > LIGHT_MAX) {
warningstream << "Node " << f.name.c_str()
<< " had greater light_source than " << LIGHT_MAX
<< ", it was reduced." << std::endl;
f.light_source = LIGHT_MAX;
}
f.damage_per_second = getintfield_default(L, index, f.damage_per_second = getintfield_default(L, index,
"damage_per_second", f.damage_per_second); "damage_per_second", f.damage_per_second);

1
src/voxelalgorithms.cpp
View File

@ -264,6 +264,7 @@ struct LightQueue {
const mapblock_v3 &block_pos, MapBlock *block, const mapblock_v3 &block_pos, MapBlock *block,
direction source_dir) direction source_dir)
{ {
assert(light <= LIGHT_SUN);
lights[light].push_back( lights[light].push_back(
ChangingLight(rel_pos, block_pos, block, source_dir)); ChangingLight(rel_pos, block_pos, block, source_dir));
} }