thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-02-21 20:27:13 +01:00
Code Releases Activity

Fix incorrect range check when converting weapon name to identifier.

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2016-07-28 00:01:40 +03:00
parent ed6bb9802f
commit 1c12c53cc9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/Misc/Weapon.cpp
View File

@ -64,12 +64,12 @@ Int32 GetWeaponID(CCStr name)
// Get the most significant characters used to identify a weapon // Get the most significant characters used to identify a weapon
CharT a = str[0], b = 0, c = 0, d = str[len-1]; CharT a = str[0], b = 0, c = 0, d = str[len-1];
// Look for deeper specifiers // Look for deeper specifiers
if(str.length() >= 3) if(len >= 3)
{ {
c = str[2]; c = str[2];
b = str[1]; b = str[1];
} }
else if(str.length() >= 2) else if(len >= 2)
{ {
b = str[1]; b = str[1];
} }
@ -198,7 +198,7 @@ Int32 GetWeaponID(CCStr name)
// [Re]mote Detonation Grenade // [Re]mote Detonation Grenade
if (b == 'e') return SQMOD_WEAPON_REMOTE; if (b == 'e') return SQMOD_WEAPON_REMOTE;
// [Ro]cket [L]aunche[r] // [Ro]cket [L]aunche[r]
else if (b == 'o' && (d == 'r' || d == 'l' || (len > 5 && str[6] == 'l'))) return SQMOD_WEAPON_ROCKETLAUNCHER; else if (b == 'o' && (d == 'r' || d == 'l' || (len > 6 && str[6] == 'l'))) return SQMOD_WEAPON_ROCKETLAUNCHER;
// [Ru]ger // [Ru]ger
else if (b == 'u') return SQMOD_WEAPON_RUGER; else if (b == 'u') return SQMOD_WEAPON_RUGER;
// Default to unknwon // Default to unknwon