Changeset 8620 for source/ariba/communication

Timestamp:

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

Author:

Christoph Mayer

Message:

-mem leaks

Location:

source/ariba/communication

Files:

• BaseCommunication.cpp (modified) (7 diffs)
• networkinfo/AddressDiscovery.cpp (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;