Add some bounds checks for CNF files.

Also check for zero file size for SPE files.

Author: wcjohns

src/SpecFile_cnf.cpp

@@ -81,16 +81,23 @@ void SpecFile::load_cnf_using_reader( CAMInputOutput::CAMIO &reader )
     meas->title_ = sampleid;
     if( sampleid.size() )
       meas->remarks_.push_back( "Sample ID: " + sampleid );
-  }catch( std::exception &e )
+  }catch( std::exception & )
   {
     // Will get here if no sample title
   }
 
-  // get the times
-  meas->start_time_ = reader.GetAquisitionTime();
-  float real_time = reader.GetRealTime();
-  meas->real_time_ = real_time;
-  meas->live_time_ = reader.GetLiveTime();
+
+  try
+  {
+    // Get the times - they are all in the same datablock, so if one throws, they will all throw.
+    meas->start_time_ = reader.GetAquisitionTime();
+    meas->real_time_ = reader.GetRealTime();
+    meas->live_time_ = reader.GetLiveTime();
+  }catch( std::exception &e )
+  {
+    // Will get here if no time block
+  }
+
   meas->sample_number_ = 1;
 
   // set the energy calibration
@@ -193,7 +200,7 @@ void SpecFile::load_cnf_using_reader( CAMInputOutput::CAMIO &reader )
         {
           result.activity_ = activity;
           result.nuclide_ = cam_results[i].Name;
-          result.real_time_ = real_time;
+          result.real_time_ = meas->real_time_;
           result.detector_ = det_name;
 
           new_det_ana->results_.push_back(result);
@@ -241,7 +248,7 @@ bool SpecFile::load_from_cnf( std::istream &input )
     cleanup_after_load();
   }catch ( std::exception &e )
   {
-    cerr << "Failed CNF: " << e.what() << endl;
+    //cerr << "Failed CNF: " << e.what() << endl;
     input.clear();
     //input.seekg( orig_pos, ios::beg );
 

src/SpecFile_spe.cpp

@@ -269,17 +269,20 @@ bool SpecFile::load_from_iaea( std::istream& istr )
       //  gracious and check if maybe this is the case.
 
       istr.seekg( 0, ios::end );
-      const istream::pos_type eof_pos = istr.tellg();
+      const istream::pos_type eof_pos = istr.tellg(); //orig_pos may be -1
+      //if( !istr || (eof_pos < 0) )
+      //  throw runtime_error( "Error reading file" );
+
       istr.seekg( orig_pos, ios::beg );
-      
-      const size_t filesize = static_cast<size_t>( 0 + eof_pos - orig_pos );
-      
+      const size_t filesize = static_cast<size_t>( 0 + std::max(eof_pos,istream::pos_type(0)) - std::max(orig_pos,istream::pos_type(0)) );
+      const size_t headerdata_size = std::min( size_t(2048), filesize + 1 );
+
       string headerdata;
-      headerdata.resize( std::min( size_t(2048), filesize + 1 ) );
+      headerdata.resize( headerdata_size );
       istr.read( &(headerdata[0]), headerdata.size() - 1 );
       istr.seekg( 0, ios::beg );
       headerdata.back() = '\0'; //JIC
-      
+
       is_ncf = ((headerdata.find("EXPTID:") != string::npos)
                 && (headerdata.find("SAMPID:") != string::npos)
                 && (headerdata.find("DATA:") != string::npos));