Commit c411474b authored by Stuart Sides's avatar Stuart Sides
Browse files

Added error check for faild conversion from clock count to ET. Fixes#2247 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6160 41f8697f-d340-4b68-9986-7bafba869bb8
parent f61b83ca

isis/src/base/objs/Spice/Spice.cpp

+2 −0
Original line number Diff line number Diff line
@@ -934,7 +934,9 @@ namespace Isis { 


    if (storedClockTime.isNull()) {

      SpiceDouble timeOutput;

      NaifStatus::CheckErrors();

      scs2e_c(sclkCode, clockValue.toAscii().data(), &timeOutput);

      NaifStatus::CheckErrors();

      storedClockTime = timeOutput;

      storeResult(key, SpiceDoubleType, timeOutput);

    }

isis/src/base/objs/Spice/Spice.h

+2 −0
Original line number Diff line number Diff line
@@ -264,6 +264,8 @@ namespace Isis { 
   *                           relative to the ascending node of the ring plane.  Fixes #1757.

   *   @history 2013-12-17 Janet Barrett - Added the instrumentBodyFixedPosition and

   *                           instrumentBodyFixedVelocity methods. Fixes #1684.

   *   @history 2015-04-30 Stuart - Added an error check around the NAIF SPICE call scs2e_c in

   *                           getClockTime. Avoids a segfault. Fixes #2247.

   *                           

   */

  class Spice {