Changeset 8620

Timestamp:

Oct 4, 2010, 2:27:16 PM (14 years ago)

Author:

Christoph Mayer

Message:

-mem leaks

Location:

source/ariba

Files:

• communication/BaseCommunication.cpp (modified) (7 diffs)
• communication/networkinfo/AddressDiscovery.cpp (modified) (1 diff)
• overlay/BaseOverlay.cpp (modified) (3 diffs)
• overlay/modules/onehop/OneHop.cpp (modified) (2 diffs)
• utility/messages/Message.cpp (modified) (1 diff)
• utility/serialization/Data.hpp (modified) (1 diff)

source/ariba/communication/BaseCommunication.cpp

@@ -279 +279 @@
 class DispatchMsg {
 public:
+        DispatchMsg() : local(NULL), remote(NULL), message(NULL) {}
         address_v* local;
         address_v* remote;
@@ -385 +386 @@
                         if( !allowlink ){
                                 logging_warn( "Overlay denied creation of link" );
+                                delete msg;
                                 return;
                         }
@@ -447 +449 @@
                         if (ld.isUnspecified()) {
                                 logging_warn("Failed to find local link " << msg->getRemoteLink().toString());
+                                delete msg;
                                 return;
                         }
@@ -458 +461 @@
                                                 );
 
-
                         localDescriptor.getEndpoints().add(
                                 msg->getRemoteDescriptor().getEndpoints(),
@@ -492 +494 @@
                         if (linkDesc.isUnspecified()) {
                                 logging_warn("Failed to find local link " << localLink.toString());
+                                delete msg;
                                 return;
                         }
@@ -521 +524 @@
                                 logging_warn("Failed to update local link "
                                         << localLink.toString());
+                                delete msg;
                                 return;
                         }
@@ -543 +547 @@
                 }
         }
+
         delete msg;
 }

source/ariba/communication/networkinfo/AddressDiscovery.cpp

@@ -77 +77 @@
         endpoint_set* set = (endpoint_set*)arg;
         struct hci_dev_info di;
+        memset(&di, 0, sizeof(struct hci_dev_info));
         di.dev_id = dev_id;
         if (ioctl(s, HCIGETDEVINFO, (void *) &di)) return 0;

source/ariba/overlay/BaseOverlay.cpp

@@ -1436 +1436 @@
                                 "Received join request for spovnet we don't handle " <<
                                 joinReq->getSpoVNetID().toString() );
+                delete joinReq;
                 return false;
         }
@@ -1459 +1460 @@
         bc->sendMessage( bcLink, &retmsg );
 
+        delete joinReq;
         return true;
 }
@@ -2158 +2160 @@
                 CommunicationListener* lst = getListener(service);
                 if(lst != NULL) lst->onKeyValue(dhtMsg->getKey(), dhtMsg->getValues() );
+                delete dhtMsg;
                 return true;
         }

source/ariba/overlay/modules/onehop/OneHop.cpp

@@ -328 +328 @@
                 } // for( ; i != iend; i++ )
 
+                delete reply;
         } // OneHopMessageTypeListingReply
 
@@ -353 +354 @@
         } // OneHopMessageTypeRoute
 
+        delete onemsg;
 }
 

source/ariba/utility/messages/Message.cpp

@@ -88 +88 @@
         Data data = data_serialize(&msg);
         stream << ",data=" << data;
-//      data.release();
+        data.release();
         stream << ")";
         return stream;

source/ariba/utility/serialization/Data.hpp

@@ -396 +396 @@
                 size_t res_length = calcLength(new_length);
                 if (old_length != res_length) {
-                        T* new_buffer = new T[res_length];
-                        if (bufferPtr != NULL) {
-                                size_t clength = res_length < old_length ? res_length : old_length;
-                                memcpy( new_buffer, bufferPtr, clength*sizeof(T) );
-                                delete [] bufferPtr;
+
+                        if(res_length <= 0){
+                                if (bufferPtr != NULL) delete [] bufferPtr;
+                                bufferPtr = NULL;
+                                bufferLen = 0;
+                        }else{
+                                T* new_buffer = new T[res_length];
+                                if (new_buffer != NULL) memset(new_buffer, 0, res_length*sizeof(T));
+                                if (bufferPtr != NULL) {
+                                        size_t clength = res_length < old_length ? res_length : old_length;
+                                        memcpy( new_buffer, bufferPtr, clength*sizeof(T) );
+                                        delete [] bufferPtr;
+                                }
+                                bufferPtr = new_buffer;
+                                bufferLen = new_length;
                         }
-                        bufferPtr = new_buffer;
-                        bufferLen = new_length;
                 }
         }