Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix a segfault caused by out of bounds array access. Caused by using a signed, negative integer as an unsigned one. 

* This probably results in unintended (but defined!) behaviour, instead of firing a missile at an invalid location we still fire the missile but to coordinates (0,0) which really is not a long term fix

 * Patch by Watermelon, slightly modified by me
 * bug reported by Hikaru (on IRC)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1540 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2007-04-26 17:25:01 +00:00
parent ae3e4927c7
commit b51409ce3b
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/projectile.c
View File

@ -816,11 +816,17 @@ proj_InFlightDirectFunc( PROJ_OBJECT *psObj )
if (bPenetrate)
{
SDWORD TargetX, TargetY;
asWeap.nStat = psObj->psWStats - asWeaponStats;
//Watermelon:just assume we damaged the chosen target
psObj->psDamaged = psNewTarget;
proj_SendProjectile( &asWeap, (BASE_OBJECT*)psObj, psObj->player, (psObj->startX + extendRad * dx / rad), (psObj->startY + extendRad * dy / rad), psObj->z, NULL, TRUE, bPenetrate, -1 );
// Determine position to fire a missile at
// (must be at least 0 because we don't use signed integers)
TargetX = MAX(psObj->startX + extendRad * dx / rad, 0);
TargetY = MAX(psObj->startY + extendRad * dy / rad, 0);
proj_SendProjectile( &asWeap, (BASE_OBJECT*)psObj, psObj->player, TargetX, TargetY, psObj->z, NULL, TRUE, bPenetrate, -1 );
}
else
{
@ -1054,11 +1060,17 @@ proj_InFlightIndirectFunc( PROJ_OBJECT *psObj )
if (bPenetrate)
{
SDWORD TargetX, TargetY;
asWeap.nStat = psObj->psWStats - asWeaponStats;
//Watermelon:just assume we damaged the chosen target
psObj->psDamaged = psNewTarget;
proj_SendProjectile( &asWeap, (BASE_OBJECT*)psObj, psObj->player, (psObj->startX + extendRad * dx / iRad), (psObj->startY + extendRad * dy / iRad), psObj->z, NULL, TRUE, bPenetrate, -1 );
// Determine position to fire a missile at
// (must be at least 0 because we don't use signed integers)
TargetX = MAX(psObj->startX + extendRad * dx / iRad, 0);
TargetY = MAX(psObj->startY + extendRad * dy / iRad, 0);
proj_SendProjectile( &asWeap, (BASE_OBJECT*)psObj, psObj->player, TargetX, TargetY, psObj->z, NULL, TRUE, bPenetrate, -1 );
}
else
{