Merge branch 'smartcmd:main' into main

1 files changed, 5 insertions, 5 deletions

diff --git a/Minecraft.World/AwardStatPacket.cpp b/Minecraft.World/AwardStatPacket.cpp
index 43328794..b2950a0e 100644
--- a/Minecraft.World/AwardStatPacket.cpp
+++ b/Minecraft.World/AwardStatPacket.cpp
@@ -8,7 +8,7 @@
 
 AwardStatPacket::AwardStatPacket()
 {
-	this->m_paramData.data = NULL;
+	this->m_paramData.data = nullptr;
 	this->m_paramData.length = 0;
 }
 
@@ -28,17 +28,17 @@ AwardStatPacket::AwardStatPacket(int statId, byteArray paramData)
 
 AwardStatPacket::~AwardStatPacket()
 {
-	if (m_paramData.data != NULL) 
+	if (m_paramData.data != nullptr) 
 	{
 		delete [] m_paramData.data;
-		m_paramData.data = NULL;
+		m_paramData.data = nullptr;
 	}
 }
 
 void AwardStatPacket::handle(PacketListener *listener) 
 {
 	listener->handleAwardStat(shared_from_this());
-	m_paramData.data = NULL;
+	m_paramData.data = nullptr;
 }
 
 void AwardStatPacket::read(DataInputStream *dis) //throws IOException 
@@ -47,7 +47,7 @@ void AwardStatPacket::read(DataInputStream *dis) //throws IOException
 
 	// Read parameter blob.
 	int length = dis->readInt();
-	if(length > 0)
+    if (length > 0 && length <= 65536)
 	{
 		m_paramData = byteArray(length);
 		dis->readFully(m_paramData);