Fixed issue #123

This adds more security checks when converting from a pointer.

Author: Ayuto

src/core/utilities/conversions.h

@@ -36,6 +36,7 @@
 #include "eiface.h"
 #include "public/game/server/iplayerinfo.h"
 #include "utilities/baseentity.h"
+#include "toolframework/itoolentity.h"
 
 BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID(CBaseEntity)
 
@@ -45,6 +46,7 @@ BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID(CBaseEntity)
 extern IVEngineServer *engine;
 extern CGlobalVars *gpGlobals;
 extern IPlayerInfoManager *playerinfomanager;
+extern IServerTools *servertools;
 
 
 //-----------------------------------------------------------------------------
@@ -241,4 +243,72 @@ CREATE_EXC_CONVERSION_FUNCTION(CPointer, Pointer, CBaseEntity *, BaseEntity);
 CREATE_EXC_CONVERSION_FUNCTION(CPointer, Pointer, unsigned int, Userid);
 CREATE_EXC_CONVERSION_FUNCTION(CPointer, Pointer, IPlayerInfo *, PlayerInfo);
 
+
+//-----------------------------------------------------------------------------
+// Helper functions
+//-----------------------------------------------------------------------------
+inline bool IsValidBaseEntityPointer(void* ptr)
+{
+	if (!ptr)
+		return false;
+
+	CBaseEntity* pEntity = servertools->FirstEntity();
+	while (pEntity) {
+		if (pEntity == ptr)
+			return true;
+
+		pEntity = servertools->NextEntity(pEntity);
+	}
+	return false;
+}
+
+inline bool IsValidBaseEntityPointer(CPointer* pPtr)
+{
+	return pPtr && IsValidBaseEntityPointer((void*) pPtr->m_ulAddr);
+}
+
+inline bool IsValidNetworkedEntityPointer(void* ptr)
+{
+	if (!ptr)
+		return false;
+
+    for (int i=0; i < gpGlobals->maxEntities; ++i)
+    {
+		edict_t* pEdict = NULL;
+		if (!EdictFromIndex(i, pEdict))
+			continue;
+
+		if (pEdict->GetUnknown()->GetBaseEntity() == ptr)
+			return true;
+	}
+	return false;
+}
+
+inline bool IsValidNetworkedEntityPointer(CPointer* pPtr)
+{
+	return pPtr && IsValidNetworkedEntityPointer((void*) pPtr->m_ulAddr);
+}
+
+inline bool IsValidPlayerPointer(void* ptr)
+{
+	if (!ptr)
+		return false;
+
+	for (int i=1; i < gpGlobals->maxClients; ++i)
+	{
+		edict_t* pEdict = NULL;
+		if (!EdictFromIndex(i, pEdict))
+			continue;
+
+		if (pEdict->GetUnknown()->GetBaseEntity() == ptr)
+			return true;
+	}
+	return false;
+}
+
+inline bool IsValidPlayerPointer(CPointer* pPtr)
+{
+	return pPtr && IsValidPlayerPointer((void*) pPtr->m_ulAddr);
+}
+
 #endif // _CONVERSIONS_H

src/core/utilities/conversions/baseentity_from.cpp

@@ -52,7 +52,7 @@ bool BaseEntityFromEdict( edict_t *pEdict, CBaseEntity*& output )
 //-----------------------------------------------------------------------------
 bool BaseEntityFromPointer( CPointer *pEntityPointer, CBaseEntity*& output )
 {
-	if (!pEntityPointer || !pEntityPointer->IsValid())
+	if (!IsValidBaseEntityPointer(pEntityPointer))
 		return false;
 
 	output = (CBaseEntity *) pEntityPointer->m_ulAddr;

src/core/utilities/conversions/basehandle_from.cpp

@@ -105,11 +105,10 @@ bool BaseHandleFromBaseEntity( CBaseEntity *pBaseEntity, CBaseHandle& output )
 //-----------------------------------------------------------------------------
 bool BaseHandleFromPointer( CPointer *pEntityPointer, CBaseHandle& output )
 {
-	CBaseEntity* pBaseEntity;
-	if (!BaseEntityFromPointer(pEntityPointer, pBaseEntity))
+	if (!IsValidNetworkedEntityPointer(pEntityPointer))
 		return false;
 
-	return BaseHandleFromBaseEntity(pBaseEntity, output);
+	return BaseHandleFromBaseEntity((CBaseEntity*) pEntityPointer->m_ulAddr, output);
 }
 
 

src/core/utilities/conversions/edict_from.cpp

@@ -136,8 +136,8 @@ bool EdictFromIntHandle( unsigned int iEntityHandle, edict_t*& output )
 //-----------------------------------------------------------------------------
 bool EdictFromPointer( CPointer *pEntityPointer, edict_t*& output )
 {
-	if (!pEntityPointer || !pEntityPointer->IsValid())
+	if (!IsValidNetworkedEntityPointer(pEntityPointer))
 		return false;
 
-	return EdictFromBaseEntity((CBaseEntity *)pEntityPointer->m_ulAddr, output);
+	return EdictFromBaseEntity((CBaseEntity *) pEntityPointer->m_ulAddr, output);
 }

src/core/utilities/conversions/index_from.cpp

@@ -78,10 +78,10 @@ bool IndexFromBaseEntity( CBaseEntity *pBaseEntity, unsigned int& output )
 //-----------------------------------------------------------------------------
 bool IndexFromPointer( CPointer *pEntityPointer, unsigned int& output )
 {
-	if (!pEntityPointer || !pEntityPointer->IsValid())
+	if (!IsValidNetworkedEntityPointer(pEntityPointer))
 		return false;
 
-	return IndexFromBaseEntity((CBaseEntity *)pEntityPointer->m_ulAddr, output);
+	return IndexFromBaseEntity((CBaseEntity *) pEntityPointer->m_ulAddr, output);
 }
 
 

src/core/utilities/conversions/inthandle_from.cpp

@@ -91,11 +91,10 @@ bool IntHandleFromBaseEntity( CBaseEntity *pBaseEntity, unsigned int& output )
 //-----------------------------------------------------------------------------
 bool IntHandleFromPointer( CPointer *pEntityPointer, unsigned int& output )
 {
-	CBaseEntity* pBaseEntity;
-	if (!BaseEntityFromPointer(pEntityPointer, pBaseEntity))
+	if (!IsValidNetworkedEntityPointer(pEntityPointer))
 		return false;
 
-	return IntHandleFromBaseEntity(pBaseEntity, output);
+	return IntHandleFromBaseEntity((CBaseEntity*) pEntityPointer->m_ulAddr, output);
 }
 
 

src/core/utilities/conversions/playerinfo_from.cpp

@@ -64,11 +64,10 @@ bool PlayerInfoFromBaseEntity( CBaseEntity *pBaseEntity, IPlayerInfo*& output)
 //-----------------------------------------------------------------------------
 bool PlayerInfoFromPointer( CPointer *pEntityPointer, IPlayerInfo*& output)
 {
-	CBaseEntity* pBaseEntity;
-	if (!BaseEntityFromPointer(pEntityPointer, pBaseEntity))
+	if (!IsValidPlayerPointer(pEntityPointer))
 		return false;
 
-	return PlayerInfoFromBaseEntity(pBaseEntity, output);
+	return PlayerInfoFromBaseEntity((CBaseEntity*) pEntityPointer->m_ulAddr, output);
 }
 
 

src/core/utilities/conversions/userid_from.cpp

@@ -117,9 +117,8 @@ bool UseridFromBaseEntity( CBaseEntity *pBaseEntity, unsigned int& output )
 //-----------------------------------------------------------------------------
 bool UseridFromPointer( CPointer *pEntityPointer, unsigned int& output )
 {
-	CBaseEntity* pBaseEntity;
-	if (!BaseEntityFromPointer(pEntityPointer, pBaseEntity))
+	if (!IsValidPlayerPointer(pEntityPointer))
 		return false;
 
-	return UseridFromBaseEntity(pBaseEntity, output);
+	return UseridFromBaseEntity((CBaseEntity*) pEntityPointer->m_ulAddr, output);
 }