Changeset 8706 in ntrip for branches/BNC_2.12


Ignore:
Timestamp:
Apr 29, 2019, 11:51:06 AM (6 years ago)
Author:
stuerze
Message:

minor changes to try to prevent crashes in case of GLONASS upload

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/BNC_2.12/src/bncephuser.cpp

    r8704 r8706  
    120120  }
    121121
    122   checkEphemeris(eph, realTime);
    123 
    124 
    125122  const t_ephGPS*     ephGPS     = dynamic_cast<const t_ephGPS*>(eph);
    126123  const t_ephGlo*     ephGlo     = dynamic_cast<const t_ephGlo*>(eph);
     
    160157  }
    161158
    162   if ((ephOld == 0 || newEph->isNewerThan(ephOld)) &&
    163       (eph->checkState() != t_eph::bad &&
    164        eph->checkState() != t_eph::outdated)) {
     159  if (ephOld == 0 || newEph->isNewerThan(ephOld)) {
     160    checkEphemeris(eph, realTime);
     161  }
     162  else {
     163    delete newEph;
     164    return failure;
     165  }
     166
     167  if (eph->checkState() != t_eph::bad &&
     168       eph->checkState() != t_eph::outdated) {
    165169    deque<t_eph*>& qq = _eph[prn];
    166170    qq.push_back(newEph);
Note: See TracChangeset for help on using the changeset viewer.