Changeset 3042 for trunk

Timestamp:

07/30/15 14:49:26 (9 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes/No?

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Fixed wrong memory deallocation. Deleted only when memory is allocated.

File:

• trunk/src/Scantable.cpp (modified) (2 diffs)

trunk/src/Scantable.cpp

@@ -2657 +2657 @@
   }
 
-  STBaselineTable* btp;
+  STBaselineTable* btp = NULL;
   ROScalarColumn<Double> tcol = ROScalarColumn<Double>(table_, "TIME");
   Vector<Double> timeSecCol = tcol.getColumn();
@@ -2734 +2734 @@
   }
 
-  delete btp;
+  if (btp != NULL) {
+        delete btp;
+  }
+
   return res;
 }