Changeset 432

Timestamp:

08/25/09 13:15:46 (15 years ago)

Author:

bhilburn

Message:

Fixed a memery allocation issue that might have segfaulted, and a memory
leak.

Files:

• vtcross/trunk/src/shell/CognitiveRadioShell.cpp (modified) (2 diffs)

vtcross/trunk/src/shell/CognitiveRadioShell.cpp

@@ -53 +53 @@
     CE_present = false;
 
-    // TODO =BUG= The params, observables, and utils arrays are not being
-    // allocated here. If an shell object is constructed, and then immediately
-    // destructed, there will be no allocated memory, and the delete operater
-    // will receive a null pointer, which will segfault.
-}
-
-
-CognitiveRadioShell::~CognitiveRadioShell()
-{
-    delete [] params;
-    delete [] observables;
-    delete [] utils;
-}
-
-
-CognitiveRadioShell::CognitiveRadioShell(const char* radioConfig, int16_t p1, \
-        int16_t p2, int16_t p3)
-{
-    LOG("Creating Cognitive Radio Shell.\n");
-
+    /* These allocations must be done here to prevent a segfault should the
+     * shell be constructed then immediately destructed. */
     params = new Parameter[10];
     observables = new Observable[10];
     utils = new Utility[10];
     radio_info = new Radio_Info;
-
+}
+
+
+CognitiveRadioShell::~CognitiveRadioShell()
+{
+    delete [] params;
+    delete [] observables;
+    delete [] utils;
+    delete Radio_Info;
+}
+
+
+CognitiveRadioShell::CognitiveRadioShell(const char* radioConfig, int16_t p1, \
+        int16_t p2, int16_t p3)
+{
+    LOG("Creating Cognitive Radio Shell.\n");
     LoadRadioConfiguration(radioConfig, params, utils, observables, radio_info);
 
@@ -652 +649 @@
 
 
-int
+int32_t
 CognitiveRadioShell::HandleMessage(int32_t socketFD)
 {