marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix overflow when calling DoEnergy with large values #1646

objectmenu
Sven Eberhardt 2016-01-22 22:51:51 -05:00
parent a32cfc2072
commit fcf870672c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/object/C4Object.cpp
View File

@ -1222,8 +1222,14 @@ void C4Object::DoDamage(int32_t iChange, int32_t iCausedBy, int32_t iCause)
void C4Object::DoEnergy(int32_t iChange, bool fExact, int32_t iCause, int32_t iCausedByPlr)
{
// iChange 100% = Physical 100000
if (!fExact) iChange=iChange*C4MaxPhysical/100;
if (!fExact)
{
// Clamp range of change to prevent integer overflow errors
// Do not clamp directly to (0...MaxEnergy)-current_energy, because
// the change value calculated here may be reduced by effect callbacks
int32_t scale = C4MaxPhysical / 100; // iChange 100% = Physical 100000
iChange = Clamp<int32_t>(iChange, std::numeric_limits<int32_t>::min()/scale, std::numeric_limits<int32_t>::max()/scale)*scale;
}
// Was zero?
bool fWasZero=(Energy==0);
// Mark last damage causing player to trace kills