zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-14 08:31:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'maint' of github.com:rheit/zdoom into maint

Browse source
This commit is contained in:
Braden Obrzut 2014-01-18 16:23:06 -05:00
commit 27f6b3c9f3
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_acs.cpp
View file

@ -4933,7 +4933,7 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, SDWORD *args, const
break; break;
case ACSF_UniqueTID: case ACSF_UniqueTID:
return P_FindUniqueTID(argCount > 0 ? args[0] : 0, argCount > 1 ? args[1] : 0); return P_FindUniqueTID(argCount > 0 ? args[0] : 0, (argCount > 1 && args[1] >= 0) ? args[1] : 0);
case ACSF_IsTIDUsed: case ACSF_IsTIDUsed:
return P_IsTIDUsed(args[0]); return P_IsTIDUsed(args[0]);

16
src/p_mobj.cpp
View file

@ -2722,12 +2722,16 @@ int P_FindUniqueTID(int start_tid, int limit)
if (start_tid != 0) if (start_tid != 0)
{ // Do a linear search. { // Do a linear search.
limit = start_tid + limit - 1; int end_tid = start_tid;
if (limit < start_tid) if (start_tid > 0 && limit > INT_MAX - start_tid + 1)
{ // If it overflowed, clamp to INT_MAX { // If 'limit+start_tid-1' overflows, clamp 'end_tid' to INT_MAX
limit = INT_MAX; end_tid = INT_MAX;
} }
for (tid = start_tid; tid <= limit; ++tid) else
{
end_tid += limit-1;
}
for (tid = start_tid; tid <= end_tid; ++tid)
{ {
if (tid != 0 && !P_IsTIDUsed(tid)) if (tid != 0 && !P_IsTIDUsed(tid))
{ {
@ -2765,7 +2769,7 @@ CCMD(utid)
{ {
Printf("%d\n", Printf("%d\n",
P_FindUniqueTID(argv.argc() > 1 ? atoi(argv[1]) : 0, P_FindUniqueTID(argv.argc() > 1 ? atoi(argv[1]) : 0,
argv.argc() > 2 ? atoi(argv[2]) : 0)); (argv.argc() > 2 && atoi(argv[2]) >= 0) ? atoi(argv[2]) : 0));
} }
//========================================================================== //==========================================================================