From fea2a0d12b7e5e64b55d30aa6a233e5c1d2571ca Mon Sep 17 00:00:00 2001
From: Sevenfm <Sevenfm@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sat, 25 Jun 2016 09:18:47 +0000
Subject: [PATCH] Items.cpp: MAXATTACHMENTS limit lighting.cpp: check return
 values

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8258 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Items.cpp      |   8 ++--
 TileEngine/lighting.cpp | 103 +++++++++++++++++++++-------------------
 2 files changed, 60 insertions(+), 51 deletions(-)

diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp
index 65ac28d0a..bcaa633c4 100644
--- a/Tactical/Items.cpp
+++ b/Tactical/Items.cpp
@@ -2332,7 +2332,8 @@ BOOLEAN ValidItemAttachmentSlot( OBJECTTYPE * pObj, UINT16 usAttachment, BOOLEAN
 	}
 	if ( !fSameItem )	//Nav: why is this check here? fSameItem can only be false here, doesn't hurt I guess...
 	{
-		for(int i = 0;i<sizeof(IncompatibleAttachments);i++)
+		//for(int i = 0;i<sizeof(IncompatibleAttachments);i++)
+		for(int i = 0; i < MAXATTACHMENTS; i++)
 		{
 			if ( FindAttachment(pObj, usAttachment, subObject) != 0 && !IsAttachmentClass(usAttachment, (AC_GRENADE|AC_ROCKET|AC_MODPOUCH) ) )
 			{//Search for identical attachments unless we're dealing with rifle grenades
@@ -2516,7 +2517,8 @@ BOOLEAN ValidItemAttachment( OBJECTTYPE * pObj, UINT16 usAttachment, BOOLEAN fAt
 
 	if ( !fSameItem )
 	{
-		for(int i = 0;i<sizeof(IncompatibleAttachments);i++)
+		//for(int i = 0;i<sizeof(IncompatibleAttachments);i++)
+		for(int i = 0; i < MAXATTACHMENTS; i++)
 		{
 			if ( FindAttachment(pObj, usAttachment, subObject) != 0 )
 			{
@@ -14946,7 +14948,7 @@ OBJECTTYPE* GetExternalFeedingObject(SOLDIERTYPE* pSoldier, OBJECTTYPE * pObject
 		// remember the caliber, magsize (TODO: really?) and type of ammo. They all have to fit
 		UINT8 ubCalibre = Weapon[usItem].ubCalibre;
 		UINT16 ubMagSize = Weapon[usItem].ubMagSize;
-		UINT8 ubAmmoType = ubAmmoType = (*pObject)[0]->data.gun.ubGunAmmoType;
+		UINT8 ubAmmoType = (*pObject)[0]->data.gun.ubGunAmmoType;
 
 		// now we now that this gun CAN be belt fed in the current situation. We now have to check if it IS
 		// we will first check for other mercs who might feed us. Afterwards we look into our own inventory
diff --git a/TileEngine/lighting.cpp b/TileEngine/lighting.cpp
index e4ab604a0..21a063da0 100644
--- a/TileEngine/lighting.cpp
+++ b/TileEngine/lighting.cpp
@@ -2098,18 +2098,18 @@ INT16 iCountY, iCountX;
 ***************************************************************************************/
 INT32 LightCreateOmni(UINT8 ubIntensity, INT16 iRadius)
 {
-INT32 iLight;
-CHAR8 usName[14];
+	INT32 iLight;
+	CHAR8 usName[14];
 
 	iLight=LightGetFree();
 	if(iLight!=(-1))
 	{
 		LightGenerateElliptical(iLight, ubIntensity, (INT16)(iRadius*DISTANCE_SCALE), (INT16)(iRadius*DISTANCE_SCALE));
-	}
 
-	sprintf(usName, "LTO%d.LHT", iRadius);
-	pLightNames[iLight]= (STR) MemAlloc(strlen(usName)+1);
-	strcpy(pLightNames[iLight], usName);
+		sprintf(usName, "LTO%d.LHT", iRadius);
+		pLightNames[iLight]= (STR) MemAlloc(strlen(usName)+1);
+		strcpy(pLightNames[iLight], usName);
+	}
 
 	return(iLight);
 }
@@ -2122,18 +2122,18 @@ CHAR8 usName[14];
 ***************************************************************************************/
 INT32 LightCreateSquare(UINT8 ubIntensity, INT16 iRadius1, INT16 iRadius2)
 {
-INT32 iLight;
-CHAR8 usName[14];
+	INT32 iLight;
+	CHAR8 usName[14];
 
 	iLight=LightGetFree();
 	if(iLight!=(-1))
 	{
 		LightGenerateSquare(iLight, ubIntensity, (INT16)(iRadius1*DISTANCE_SCALE), (INT16)(iRadius2*DISTANCE_SCALE));
-	}
 
-	sprintf(usName, "LTS%d-%d.LHT", iRadius1, iRadius2);
-	pLightNames[iLight]= (STR) MemAlloc(strlen(usName)+1);
-	strcpy(pLightNames[iLight], usName);
+		sprintf(usName, "LTS%d-%d.LHT", iRadius1, iRadius2);
+		pLightNames[iLight]= (STR) MemAlloc(strlen(usName)+1);
+		strcpy(pLightNames[iLight], usName);
+	}
 
 	return(iLight);
 }
@@ -2146,16 +2146,18 @@ CHAR8 usName[14];
 ***************************************************************************************/
 INT32 LightCreateElliptical(UINT8 ubIntensity, INT16 iRadius1, INT16 iRadius2)
 {
-INT32 iLight;
-CHAR8 usName[14];
+	INT32 iLight;
+	CHAR8 usName[14];
 
 	iLight=LightGetFree();
 	if(iLight!=(-1))
+	{
 		LightGenerateElliptical(iLight, ubIntensity, (INT16)(iRadius1*DISTANCE_SCALE), (INT16)(iRadius2*DISTANCE_SCALE));
 
-	sprintf(usName, "LTE%d-%d.LHT", iRadius1, iRadius2);
-	pLightNames[iLight]= (STR) MemAlloc(strlen(usName)+1);
-	strcpy(pLightNames[iLight], usName);
+		sprintf(usName, "LTE%d-%d.LHT", iRadius1, iRadius2);
+		pLightNames[iLight]= (STR) MemAlloc(strlen(usName)+1);
+		strcpy(pLightNames[iLight], usName);
+	}
 
 	return(iLight);
 }
@@ -3059,38 +3061,41 @@ INT32 LightLoad(STR pFilename)
 	HWFILE hFile;
 	INT32 iLight;
 
-	if((iLight=LightGetFree())==(-1))
-		return(-1);
+	iLight=LightGetFree();
+
+	if( iLight == -1 )
+		return (-1);
+
+	if((hFile=FileOpen(pFilename, FILE_ACCESS_READ, FALSE))!=0)
+	{
+		FileRead(hFile, &usTemplateSize[iLight], sizeof(UINT16), NULL);
+		if((pLightList[iLight]= (LIGHT_NODE *) MemAlloc(usTemplateSize[iLight]*sizeof(LIGHT_NODE)))==NULL)
+		{
+			usTemplateSize[iLight]=0;
+			return(-1);
+		}
+		FileRead(hFile, pLightList[iLight], sizeof(LIGHT_NODE)*usTemplateSize[iLight], NULL);
+
+		FileRead(hFile, &usRaySize[iLight], sizeof(UINT16), NULL);
+		if((pLightRayList[iLight]= (UINT16 *) MemAlloc(usRaySize[iLight]*sizeof(UINT16)))==NULL)
+		{
+			usTemplateSize[iLight]=0;
+			usRaySize[iLight]=0;
+			MemFree(pLightList[iLight]);
+			return(-1);
+		}
+		FileRead(hFile, pLightRayList[iLight], sizeof(UINT16)*usRaySize[iLight], NULL);
+
+		FileClose(hFile);
+
+		pLightNames[iLight]= (STR) MemAlloc(strlen(pFilename)+1);
+		strcpy(pLightNames[iLight], pFilename);
+	}
 	else
 	{
-		if((hFile=FileOpen(pFilename, FILE_ACCESS_READ, FALSE))!=0)
-		{
-			FileRead(hFile, &usTemplateSize[iLight], sizeof(UINT16), NULL);
-			if((pLightList[iLight]= (LIGHT_NODE *) MemAlloc(usTemplateSize[iLight]*sizeof(LIGHT_NODE)))==NULL)
-			{
-				usTemplateSize[iLight]=0;
-				return(-1);
-			}
-			FileRead(hFile, pLightList[iLight], sizeof(LIGHT_NODE)*usTemplateSize[iLight], NULL);
-
-			FileRead(hFile, &usRaySize[iLight], sizeof(UINT16), NULL);
-			if((pLightRayList[iLight]= (UINT16 *) MemAlloc(usRaySize[iLight]*sizeof(UINT16)))==NULL)
-			{
-				usTemplateSize[iLight]=0;
-				usRaySize[iLight]=0;
-				MemFree(pLightList[iLight]);
-				return(-1);
-			}
-			FileRead(hFile, pLightRayList[iLight], sizeof(UINT16)*usRaySize[iLight], NULL);
-
-			FileClose(hFile);
-
-			pLightNames[iLight]= (STR) MemAlloc(strlen(pFilename)+1);
-			strcpy(pLightNames[iLight], pFilename);
-		}
-		else
-			return(-1);
+		return(-1);
 	}
+
 	LightCalcRect(iLight);
 	return(iLight);
 }
@@ -3225,9 +3230,11 @@ INT32 iCount;
 ********************************************************************************/
 INT32 LightSpriteCreate(STR pName, UINT32 uiLightType)
 {
-INT32 iSprite;
+	INT32 iSprite;
 
-	if((iSprite=LightSpriteGetFree())!=(-1))
+	iSprite = LightSpriteGetFree();
+
+	if( iSprite != -1 )
 	{
 		memset(&LightSprites[iSprite], 0, sizeof(LIGHT_SPRITE));