Changeset 15343

Timestamp:

04/22/12 01:11:46 (11 years ago)

Author:

nit

Message:

fix memleak

File:

• titan/titan/inetwork.h (modified) (10 diffs)

titan/titan/inetwork.h

@@ -121 +121 @@
                 node->device = device;
         }
+        else
+                free(device);
 
         if(ostrcmp(node->ip, ip) != 0)
@@ -127 +129 @@
                 node->ip = ip;
         }
+        else
+                free(ip);
 
         if(ostrcmp(node->netmask, netmask) != 0)
@@ -133 +137 @@
                 node->netmask = netmask;
         }
+        else
+                free(netmask);
 
         if(ostrcmp(node->broadcast, broadcast) != 0)
@@ -139 +145 @@
                 node->broadcast = broadcast;
         }
+        else
+                free(broadcast);
 
         if(flag == 0)
@@ -147 +155 @@
                         node->mac = mac;
                 }
+                else
+                        free(mac);
 
                 node->dhcp = dhcp;
         }
+        else
+                free(mac);
+        
         node->found = 1;
 
@@ -346 +359 @@
                                 tmp_mac = command(cmd);
                 
-                                if (tmp_mac != 0)
-                                        tmp_mac = string_newline(ostrcat(tmp_mac, "", 1, 0));
+                                if(tmp_mac != NULL)
+                                        tmp_mac = string_newline(tmp_mac);
                                 else
                                         tmp_mac = ostrcat(tmp_mac, "00:00:00:00:00:00", 1, 0);
@@ -368 +381 @@
                 {
                         if(self == NULL)
-                                node = changeinetwork(tmp_device, tmp_ipaddresse, tmp_netmask, tmp_mac,  tmp_broadcast, tmp_dhcp, tmpinetwork, 0);
+                                node = changeinetwork(tmp_device, tmp_ipaddresse, tmp_netmask, tmp_mac, tmp_broadcast, tmp_dhcp, tmpinetwork, 0);
                         else
-                                node = changeinetwork(tmp_device, tmp_ipaddresse, tmp_netmask, tmp_mac,  tmp_broadcast, tmp_dhcp, tmpinetwork, 1);
-                }
-                else
-                        node = addinetwork(tmp_device, tmp_ipaddresse, tmp_netmask, tmp_mac,  tmp_broadcast, tmp_dhcp, node);
+                                node = changeinetwork(tmp_device, tmp_ipaddresse, tmp_netmask, tmp_mac, tmp_broadcast, tmp_dhcp, tmpinetwork, 1);
+                }
+                else
+                        node = addinetwork(tmp_device, tmp_ipaddresse, tmp_netmask, tmp_mac, tmp_broadcast, tmp_dhcp, node);
 
                 free(cmd); cmd = NULL;
@@ -384 +397 @@
         if(self == NULL)
         {
+                free(status.gateway); status.gateway = NULL;
                 tmp_gateway = getdefaultgw();
-                if (tmp_gateway != NULL)
+                if(tmp_gateway != NULL)
                 {
                         tmpstr = fixip(tmp_gateway, 0);
@@ -394 +408 @@
 
                 // DNSSERVER1
+                free(status.dnsserver1); status.dnsserver1 = NULL;
                 cmd = ostrcat(cmd, "cat /var/etc/resolv.conf | grep nameserver | awk '{ print $2 }' | head -n1 | tail -n1", 1, 0);
                 tmp_dnsserver1 = ostrcat(tmp_dnsserver1 , command(cmd), 1, 1);
-                if (tmp_dnsserver1 != NULL)
+                if(tmp_dnsserver1 != NULL)
                 {
                         tmpstr = fixip(tmp_dnsserver1, 0);
@@ -407 +422 @@
 
                 // DNSSERVER2
+                free(status.dnsserver2); status.dnsserver2 = NULL;
                 cmd = ostrcat(cmd, "cat /var/etc/resolv.conf | grep nameserver | awk '{ print $2 }' | head -n2 | tail -n1", 1, 0);
                 tmp_dnsserver2 = ostrcat(tmp_dnsserver2 , command(cmd), 1, 1);
-                if (tmp_dnsserver2 != NULL)
+                if(tmp_dnsserver2 != NULL)
                 {
                         tmpstr = fixip(tmp_dnsserver2, 0);