Changeset 2070 for code/branches/objecthierarchy/src/network/packet/Gamestate.cc

Timestamp:

Oct 31, 2008, 12:05:12 AM (16 years ago)

Author:

rgrieder

Message:

Properly took care of network::packet::Packet destruction. It depends very much whether the the data was allocated by ENet or by ourselves.

File:

• code/branches/objecthierarchy/src/network/packet/Gamestate.cc (modified) (1 diff)

code/branches/objecthierarchy/src/network/packet/Gamestate.cc

@@ -286 +286 @@
   //copy over the header
   *GAMESTATE_HEADER(ndata) = *HEADER;
-  //delete old (compressed data)
-  delete[] data_;
+
+  if (this->bDataENetAllocated_){
+    // Memory was allocated by ENet. --> We let it be since enet_packet_destroy will
+    // deallocated it anyway. So data and packet stay together.
+    this->bDataENetAllocated_ = false;
+  }
+  else{
+    // We allocated the memory in the first place (unlikely). So we destroy the old data
+    // and overwrite it with the new decompressed data.
+    delete[] this->data_;
+  }
+
   //set new pointers
   data_ = ndata;