Changeset 1432 for code/branches/network/src/network/PacketDecoder.cc

Timestamp:

May 26, 2008, 10:06:36 PM (16 years ago)

Author:

scheusso

Message:

found a bug in gamestate diffing (in some cases the gamestate diffed was
filled with zeros at the end)

File:

• code/branches/network/src/network/PacketDecoder.cc (modified) (4 diffs)

code/branches/network/src/network/PacketDecoder.cc

@@ -127 +127 @@
   bool PacketDecoder::command( ENetPacket* packet, int clientId ){
     int length = *(int*)((unsigned char *)packet->data+sizeof(int));
+    if(length<=0)
+      return false;
     void *data = (void *)new unsigned char[length];
     memcpy(data, (void *)(packet->data+2*sizeof(int)), length);
@@ -158 +160 @@
   {
     chat* chatting = new chat;
+    if(packet->dataLength==4)
+      return;
     chatting->id = (int)*packet->data; //first copy id into new struct
     //since the chat message is a char*, allocate the memory needed
@@ -204 +208 @@
       COUT(2) << "PacketDecoder: compsize is 0" << std::endl;
 //     currentState->data = (unsigned char*)(malloc( currentState->compsize ));
+    if(currentState->compsize==0)
+      return;
     currentState->data = new unsigned char[currentState->compsize];
     if(currentState->data==NULL)
@@ -221 +227 @@
     cid->id = ((classid *)(packet->data))->id;
     cid->clid = ((classid *)(packet->data))->clid;
+    if(cid->length==0)
+      return;
 //     cid->message = (const char *)malloc(cid->length);
     cid->message = new char[cid->length];