Changeset 2785 for trunk/external-alma/atnf/PKSIO/NROOTFDataset.cc

Timestamp:

03/08/13 17:58:53 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: 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...

Candidate bug fix for seg. fault on Mac.

File:

• trunk/external-alma/atnf/PKSIO/NROOTFDataset.cc (modified) (3 diffs)

trunk/external-alma/atnf/PKSIO/NROOTFDataset.cc

@@ -35 +35 @@
 #include <iostream>
 #include <cstring>
+
+#define STRING2CHAR(s) const_cast<char *>((s).c_str())
 
 using namespace std ;
@@ -80 +82 @@
   LogIO os( LogOrigin( "NROOTFDataset", "fillHeader()", WHERE ) ) ;
 
-  int arymax = arrayMax() ;
-
-  string str256( 256, ' ' ) ;
-  char c256[256] ;
   // make sure file pointer points a beginning of the file
   fseek( fp_, 0, SEEK_SET ) ;
@@ -90 +88 @@
 
   // specific part
-  strcpy( c256, str256.c_str() ) ;
-  if ( readHeader( c256, 180 ) == -1 ) {
+  CDMY1.resize(180);
+  if ( readHeader( STRING2CHAR(CDMY1), 180 ) == -1 ) {
     os << LogIO::WARN << "Error while reading data CDMY1." << LogIO::POST ;
     return -1 ;
   }
-  c256[180] = '\0' ;
-  CDMY1 = string( c256 ) ;
   // DEBUG
   //cout << "CDMY1 = " << CDMY1 << endl ;