Changeset 8401 in ntrip

Timestamp:

Jun 29, 2018, 1:21:43 PM (6 years ago)

Author:

stuerze

Message:

minor changes to prevent a crash of the program

Location:

trunk/BNC/src/PPP

Files:

• pppEphPool.cpp (modified) (4 diffs)
• pppEphPool.h (modified) (4 diffs)

trunk/BNC/src/PPP/pppEphPool.cpp

@@ -82 +82 @@
 /////////////////////////////////////////////////////////////////////////////
 void t_pppEphPool::t_satEphPool::putOrbCorrection(t_orbCorr* corr) {
+  if (_ephs.empty()) {
+    return;
+  }
+
   for (unsigned ii = 0; ii < _ephs.size(); ii++) {
     t_eph* eph = _ephs[ii];
@@ -94 +98 @@
 /////////////////////////////////////////////////////////////////////////////
 void t_pppEphPool::t_satEphPool::putClkCorrection(t_clkCorr* corr) {
+  if (_ephs.empty()) {
+    return;
+  }
+
   for (unsigned ii = 0; ii < _ephs.size(); ii++) {
     t_eph* eph = _ephs[ii];
@@ -107 +115 @@
 t_irc t_pppEphPool::t_satEphPool::getCrd(const bncTime& tt, ColumnVector& xc,
                                            ColumnVector& vv) const {
+  if (_ephs.empty()) {
+    return failure;
+  }
+
   for (unsigned ii = 0; ii < _ephs.size(); ii++) {
     t_eph* eph = _ephs[ii];
@@ -126 +138 @@
 /////////////////////////////////////////////////////////////////////////////
 int t_pppEphPool::t_satEphPool::getChannel() const {
-  if (_ephs.size() > 0) {
+  if (!_ephs.empty()) {
     return _ephs[0]->slotNum();
   }

trunk/BNC/src/PPP/pppEphPool.h

@@ -14 +14 @@
     _maxQueueSize = maxQueueSize;
   }
-  ~t_pppEphPool() {}; 
+  ~t_pppEphPool() {};
 
   void putEphemeris(t_eph* eph);
@@ -20 +20 @@
   void putClkCorrection(t_clkCorr* corr);
 
-  t_irc getCrd(const t_prn& prn, const bncTime& tt, 
+  t_irc getCrd(const t_prn& prn, const bncTime& tt,
                     ColumnVector& xc, ColumnVector& vv) const;
 
@@ -35 +35 @@
     t_satEphPool() {};
     ~t_satEphPool() {
+      if (_ephs.empty()) return;
       for (unsigned ii = 0; ii < _ephs.size(); ii++) {
         delete _ephs[ii];
@@ -42 +43 @@
     void putOrbCorrection(t_orbCorr* corr);
     void putClkCorrection(t_clkCorr* corr);
-    t_irc getCrd(const bncTime& tt, 
+    t_irc getCrd(const bncTime& tt,
                       ColumnVector& xc, ColumnVector& vv) const;
     int getChannel() const;