Changeset 6564 in ntrip

Timestamp:

Jan 23, 2015, 4:58:21 PM (9 years ago)

Author:

stuerze

Message:

try to fix some memory problems

Location:

trunk/BNC/src

Files:

• RTCM3/RTCM3coDecoder.cpp (modified) (5 diffs)
• bncephuser.cpp (modified) (1 diff)

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -238 +238 @@
       t_orbCorr orbCorr;
       orbCorr._prn.set(sysCh, _clkOrb.Sat[ii].ID);
-      orbCorr._staID     = _staID.toAscii().data();
+      orbCorr._staID     = _staID.toStdString();
       orbCorr._iod       = _clkOrb.Sat[ii].IOD;
       orbCorr._time      = _lastTime;
@@ -264 +264 @@
       t_clkCorr clkCorr;
       clkCorr._prn.set(sysCh, _clkOrb.Sat[ii].ID);
-      clkCorr._staID      = _staID.toAscii().data();
+      clkCorr._staID      = _staID.toStdString();
       clkCorr._time       = _lastTime;
       clkCorr._updateInt  = _clkOrb.UpdateInterval;
@@ -314 +314 @@
     t_satCodeBias satCodeBias;
     satCodeBias._prn.set(sysCh, _codeBias.Sat[ii].ID);
-    satCodeBias._staID     = _staID.toAscii().data();
+    satCodeBias._staID     = _staID.toStdString();
     satCodeBias._time      = _lastTime;
     satCodeBias._updateInt = _codeBias.UpdateInterval;
@@ -344 +344 @@
     t_satPhaseBias satPhaseBias;
     satPhaseBias._prn.set(sysCh, _phaseBias.Sat[ii].ID);
-    satPhaseBias._staID      = _staID.toAscii().data();
+    satPhaseBias._staID      = _staID.toStdString();
     satPhaseBias._time       = _lastTime;
     satPhaseBias._updateInt  = _phaseBias.UpdateInterval;
@@ -369 +369 @@
     _vTecMap[_lastTime]._time  = _lastTime;
     _vTecMap[_lastTime]._updateInt =  _vTEC.UpdateInterval;
-    _vTecMap[_lastTime]._staID = _staID.toAscii().data();
+    _vTecMap[_lastTime]._staID = _staID.toStdString();
     for (unsigned ii = 0; ii < _vTEC.NumLayers; ii++) {
       const VTEC::IonoLayers& ionoLayer = _vTEC.Layers[ii];

trunk/BNC/src/bncephuser.cpp

@@ -157 +157 @@
   }
   else {
+    delete newEph;
     return failure;
   }