Changeset ca4062a in tol

Timestamp:

Nov 14, 2011, 4:52:15 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

099d559

Parents:

e318a3f

Message:

Fixes #1337
SerTms methods must ensure that dating is not null before to use it to avoid invalid access.
When dating is null SerTms behaviour will be the same that empty TimeSet W

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3836 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/timeset_type/tmsgrav.cpp (modified) (8 diffs)

tol/btol/timeset_type/tmsgrav.cpp

@@ -2457 +2457 @@
 {
   BUserTimeSerie* ser = Tsr(Arg(1));
-  return(ser->Dating() &&
+  return(ser && ser->Dating() &&
            ser->Dating()->Contain(dte) &&
                (
@@ -2484 +2484 @@
 {
   BUserTimeSerie* ser = Tsr(Arg(1));
+  if(!ser) { return; }
+  BUserTimeSet* tms = ser->Dating();
+  if(!tms) { return; }
   BHash aux;
-  ser->Dating()->GetHashBetween(aux,  first, last);
+  tms->GetHashBetween(aux,  first, last);
   BTmsTemporary::GetHashBetween(hash, first, last);
 }
@@ -2494 +2497 @@
 //--------------------------------------------------------------------
 {
+  BUserTimeSerie* ser = Tsr(Arg(1));
+  if(!ser) { return(BDate::End()); }
+  BUserTimeSet* tms = ser->Dating();
+  if(!tms) { return(BDate::End()); }
   BDate dte = EnsureNotAbortedSuccessor(dte_);
   EnsureLimitsSuccessor(dte);
@@ -2502 +2509 @@
   if(!curLimit.HasValue()) { curLimit = BDate::DefaultLast(); }
 //Std(Out()+"\nBTmsOfSerie::Successor of "+ser->Identify()+" "+dte);
-  BUserTimeSerie* ser = Tsr(Arg(1));
   for(n=iter=0; iter<N; iter++)
   {
@@ -2521 +2527 @@
       }
     }
-        dte += ser->Dating();
+        dte += tms;
     if(Contain(dte)) { return(dte); }
     if(dte>ser->LastDate()) { return(BDate::End()); }
@@ -2533 +2539 @@
 //--------------------------------------------------------------------
 {
+  BUserTimeSerie* ser = Tsr(Arg(1));
+  if(!ser) { return(BDate::Begin()); }
+  BUserTimeSet* tms = ser->Dating();
+  if(!tms) { return(BDate::Begin()); }
   BDate dte = EnsureNotAbortedPredecessor(dte_);
   EnsureLimitsPredecessor(dte);
@@ -2540 +2550 @@
   BDate curLimit = CurrentCalcFirstDate();
   if(curLimit==BDate::Begin()) { curLimit = BDate::DefaultFirst(); }
-  BUserTimeSerie* ser = Tsr(Arg(1));
   for(n=iter=0; iter<N; iter++)
   {
@@ -2558 +2567 @@
       }
     }
-        dte -= ser->Dating();
+        dte -= tms;
     if(Contain(dte)) { return(dte); }
     if(dte>ser->LastDate()) { return(BDate::End()); }