Fix null dereference in weather update functions

minetest · Sep 17, 2013 · f7ee5da · f7ee5da
1 parent c039822
commit f7ee5da
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/map.cpp b/src/map.cpp
@@ -3935,8 +3935,10 @@ s16 ServerMap::updateBlockHeat(ServerEnvironment *env, v3s16 p, MapBlock *block)
 	f32 heat = m_emerge->biomedef->calcBlockHeat(p, m_seed,
 			env->getTimeOfDayF(), gametime * env->getTimeOfDaySpeed());
 
-	block->heat = heat;
-	block->weather_update_time = gametime;
+	if(block) {
+		block->heat = heat;
+		block->weather_update_time = gametime;
+	}
 	return heat;
 }
 
@@ -3954,8 +3956,10 @@ s16 ServerMap::updateBlockHumidity(ServerEnvironment *env, v3s16 p, MapBlock *bl
 	f32 humidity = m_emerge->biomedef->calcBlockHumidity(p, m_seed,
 			env->getTimeOfDayF(), gametime * env->getTimeOfDaySpeed());
 
-	block->humidity = humidity;
-	block->weather_update_time = gametime;
+	if(block) {
+		block->humidity = humidity;
+		block->weather_update_time = gametime;
+	}
 	return humidity;
 }