Changeset 433

Timestamp:

08/25/09 13:20:37 (15 years ago)

Author:

bhilburn

Message:

Reworked memory allocation in the constructors a bit more. Looking at,
I'm not 100% certain how it wasn't segfaulting previously during normal
operation since 'LoadConfiguration?' was being called before the memory
was allocated.

Files:

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

vtcross/trunk/src/shell/CognitiveRadioShell.cpp

@@ -49 +49 @@
 {
     LOG("Creating Cognitive Radio Shell.\n");
+
     SML_present = false;
     PE_present = false;
     CE_present = false;
 
-    /* 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];
@@ -75 +74 @@
 {
     LOG("Creating Cognitive Radio Shell.\n");
+
+    SML_present = false;
+    PE_present = false;
+    CE_present = false;
+
+    params = new Parameter[10];
+    observables = new Observable[10];
+    utils = new Utility[10];
+    radio_info = new Radio_Info;
+
     LoadRadioConfiguration(radioConfig, params, utils, observables, radio_info);