From c9e84c563db7388ff00896604f74a72c74c47a41 Mon Sep 17 00:00:00 2001
From: Twilight Suzuka <rukia>
Date: Tue, 3 Jan 2006 21:48:59 +0000
Subject: [PATCH] Updated to include additional protection for PDATA.

---
 dlls/BB/bb.cpp  |   5 +++++
 dlls/BB/bb.ncb  | Bin 191488 -> 273408 bytes
 dlls/BB/pdata.h |  15 +++++++++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/dlls/BB/bb.cpp b/dlls/BB/bb.cpp
index bdfd5918..94e1d828 100644
--- a/dlls/BB/bb.cpp
+++ b/dlls/BB/bb.cpp
@@ -31,6 +31,11 @@ static cell AMX_NATIVE_CALL get_user_level(AMX *amx,cell *params)
 
 static cell AMX_NATIVE_CALL set_user_level(AMX *amx,cell *params)
 {
+	if(GetUserLevel(params[0]) > params[2])
+	{
+		MF_LogError(amx,AMX_ERR_NATIVE,"Must set to a level higher than current one!");
+		return 0;
+	}
 	SetUserLevel(params[1], params[2] );
 	return 1;
 }
diff --git a/dlls/BB/bb.ncb b/dlls/BB/bb.ncb
index 60e55f562f32f36c04a0bae15ebc389a391074e3..b1106abdcbe7a89395a9994aff0f7b5647732e15 100644
GIT binary patch
delta 3591
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
O;7EyWe_3<dgZ>W%?M&kU

delta 216
zcmZp;A<%Gxdx8efZUzR13}zq!1k)G3WftD9pu)J5neo9yN3qR{9QT<gJFsvuO2C*3
zn|L@lL>PgJ*I)PP?b-0mV@oPaf~*2-%k+aLjP4r)<}ypL0A)eg1c+e(WW#jETg>7h
z<1aEZvTbL4!t|fHNuf=FahU?snrR{|9E^<HIYn50b2G^>OlNz*G>?}JsA)40Zvo=1
a+c!R7@@JmTcn4^Pz!Rnq%$VfF08IeeLpu%t

diff --git a/dlls/BB/pdata.h b/dlls/BB/pdata.h
index c8698b98..54aaa9fc 100644
--- a/dlls/BB/pdata.h
+++ b/dlls/BB/pdata.h
@@ -11,10 +11,20 @@
 	#define EXTRAOFFSET					0 // no change in Windows builds
 #endif // defined __linux__
 
+inline edict_t* MF_GetEntityEdict( long& EntID )
+{
+	if( (EntID > 0) && (EntID <= (gpGlobals->maxClients) ) ) 
+		return MF_GetPlayerEdict( EntID );
+
+	return NULL;
+}
+
 template <typename ValueType>
 inline void SetPData( long& targetid, long offset, ValueType value, bool reset = false )
 {
-	edict_t* target = MF_GetPlayerEdict( targetid );
+	edict_t* target = MF_GetEntityEdict( targetid );
+	if(target == NULL) return;
+
 	*((ValueType *)target->pvPrivateData + offset + EXTRAOFFSET) = value;
 	if(reset) UpdateBBHud( targetid );
 };
@@ -22,7 +32,8 @@ inline void SetPData( long& targetid, long offset, ValueType value, bool reset =
 template <typename ValueType>
 inline ValueType GetPData( long& targetid, long offset, ValueType value )
 {
-	edict_t* target = MF_GetPlayerEdict( targetid );
+	edict_t* target = MF_GetEntityEdict( targetid );
+	if(target == NULL) return NULL;
 	return *((ValueType *)target->pvPrivateData + offset + EXTRAOFFSET);
 }