Changeset 442

Timestamp:

08/26/09 18:35:44 (15 years ago)

Author:

bhilburn

Message:

Fixed a memory leak (and redundant memory allocation), and moved the
internal storage of SML_Config to a std::string to prevent a segfault.

Files:

• vtcross/trunk/src/service_management_layer/ServiceManagementLayer.cpp (modified) (6 diffs)

vtcross/trunk/src/service_management_layer/ServiceManagementLayer.cpp

@@ -28 +28 @@
 
 #include <cmath>
+#include <cstdio>
+#include <cstdlib>
 #include <cstring>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
 #include <stdint.h>
 
@@ -40 +39 @@
 #include <fcntl.h>
 #include <sqlite3.h>
+#include <string>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
@@ -80 +80 @@
 services_DB _services_DB;
 data_DB _data_DB;
-const char *_SML_Config;
+string _SML_Config;
 bool shellFound;
 
@@ -142 +142 @@
 }
 
-//Note that sizes of CE_List, miss, and service are hardcoded for now.
-//Also, their sizes are hardcoded into the code in various places; a fix for a future version.
+/* Note that sizes of CE_List, miss, and service are hardcoded for now.
+ * Also, their sizes are hardcoded into the code in various places; a fix 
+ * for a future version. */
 ServiceManagementLayer::ServiceManagementLayer(const char* SML_Config, \
     const char* serverName, const char* serverPort, int16_t clientPort)
 {
     LOG("Creating Service Management Layer.\n");
-    _SML_Config = SML_Config;
+
+    _SML_Config = string(SML_Config);
     SMLport = clientPort;
 
     ConnectToShell(serverName, serverPort);
-    CE_List = (CE_Reg *) malloc(10*sizeof(struct CE_Reg));
     CE_List = new CE_Reg[10];
 
     miss = new Mission[10];
-    for(int i = 0; i < 10; i++)
+    for(size_t i = 0; i < 10; i++)
         miss[i].services = new Service[30];
 
@@ -162 +163 @@
 
     LoadConfiguration(SML_Config, miss);
+
     CreateServicesDB();
     CreateDataDB();
@@ -1399 +1401 @@
     for(int i = 0; i < 10; i++)
         miss[i].services = new Service[30];
-    LoadConfiguration(_SML_Config, miss);
+    LoadConfiguration(_SML_Config.c_str(), miss);
 }