Changeset 2668 in ntrip for trunk/rtcm3torinex/lib

Timestamp:

Nov 11, 2010, 10:09:55 AM (13 years ago)

Author:

stoecker

Message:

fixed illegal memory access

File:

• trunk/rtcm3torinex/lib/rtcm3torinex.c (modified) (6 diffs)

trunk/rtcm3torinex/lib/rtcm3torinex.c

@@ -955 +955 @@
         };
 
-        int sys = RTCM3_MSM_GPS, i, count, j, old = 0, wasamb = 0;
+        int sys = RTCM3_MSM_GPS, i, count, j, old = 0, wasnoamb = 0;
         int syncf, sigmask, numsat = 0, numsig = 0, numcells;
         uint64_t satmask, cellmask, ui;
@@ -1017 +1017 @@
         {
         case 1: case 2: case 3:
-          ++wasamb;
+          ++wasnoamb;
           for(j = numsat; j--;)
             GETFLOAT(rrmod[j], 10, 1/1024.0)
@@ -1184 +1184 @@
                   {
                     gnss->measdata[num][cd.typeR] = psr[count]
-                    +(rrmod[numsat]+rrint[numsat])*LIGHTSPEED/1000.0;
+                    +(rrmod[numsat])*LIGHTSPEED/1000.0;
                     gnss->dataflags[num] |= (1<<cd.typeR);
                   }
@@ -1192 +1192 @@
                   {
                     gnss->measdata[num][cd.typeP] = cp[count]
-                    +(rrmod[numsat]+rrint[numsat])*LIGHTSPEED/1000.0/wl;
+                    +(rrmod[numsat])*LIGHTSPEED/1000.0/wl;
                     if(handle->lastlockmsm[j][i] != ll[count])
                     {
@@ -1205 +1205 @@
                   {
                     gnss->measdata[num][cd.typeR] = psr[count]
-                    +(rrmod[numsat]+rrint[numsat])*LIGHTSPEED/1000.0;
+                    +(rrmod[numsat])*LIGHTSPEED/1000.0;
                     gnss->dataflags[num] |= (1<<cd.typeR);
                   }
@@ -1337 +1337 @@
         if(!syncf || old)
         {
-          if(wasamb) /* not RINEX compatible without */
+          if(!wasnoamb) /* not RINEX compatible without */
             ret = 1;
           else