Changeset 2352 in ntrip for trunk/rtcm3torinex

Timestamp:

Mar 5, 2010, 12:11:06 PM (14 years ago)

Author:

stoecker

Message:

fixed overflow

Location:

trunk/rtcm3torinex

Files:

• makefile (modified) (1 diff)
• rtcm3torinex.c (modified) (5 diffs)
• rtcm3torinex.h (modified) (3 diffs)

trunk/rtcm3torinex/makefile

@@ -2 +2 @@
 # fixable. There is nothing special at this source.
 
-rtcm3torinex: rtcm3torinex.c
-        $(CC) -Wall -W -O3 -lm $? -o $@
+rtcm3torinex: rtcm3torinex.c rtcm3torinex.h
+        $(CC) -Wall -W -O3 -lm rtcm3torinex.c -o $@
 
 archive:

trunk/rtcm3torinex/rtcm3torinex.c

@@ -1 +1 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.c,v 1.31 2010/01/16 11:07:57 weber Exp $
+  $Id: rtcm3torinex.c,v 1.38 2010/03/01 13:48:25 stoecker Exp $
   Copyright (C) 2005-2008 by Dirk Stöcker <stoecker@alberding.eu>
 
@@ -55 +55 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.31 $";
+static char revisionstr[] = "$Revision: 1.38 $";
 
 #ifndef COMPILEDATE
@@ -490 +490 @@
         SKIPBITS(4) /* smind, smint */
 
-        while(numsats--)
+        while(numsats-- && gnss->numsats < GNSS_MAXSATS)
         {
           int sv, code, l1range, c,l,s,ce,le,se,amb=0;
@@ -658 +658 @@
         SKIPBITS(4) /* smind, smint */
 
-        while(numsats--)
+        while(numsats-- && gnss->numsats < GNSS_MAXSATS)
         {
           int sv, code, l1range, c,l,s,ce,le,se,amb=0;
@@ -1684 +1684 @@
 
 #ifndef NO_RTCM3_MAIN
-static char datestr[]     = "$Date: 2010/01/16 11:07:57 $";
+static char datestr[]     = "$Date: 2010/03/01 13:48:25 $";
 
 /* The string, which is send as agent in HTTP request */

trunk/rtcm3torinex/rtcm3torinex.h

@@ -4 +4 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.h,v 1.19 2010/01/12 12:13:23 mervart Exp $
+  $Id: rtcm3torinex.h,v 1.11 2010/03/01 13:48:25 stoecker Exp $
   Copyright (C) 2005-2006 by Dirk Stöcker <stoecker@alberding.eu>
 
@@ -24 +24 @@
 
 #include <stdio.h>
+
+#define GNSS_MAXSATS 64
 
 #define PRN_GPS_START             1
@@ -114 +116 @@
   int    numsats;
   double timeofweek;         /* milliseconds in GPS week */
-  double measdata[24][GNSSENTRY_NUMBER];  /* data fields */ 
-  int    dataflags[24];      /* GPSDF_xxx */
-  int    satellites[24];     /* SV - IDs */
-  int    channels[24];       /* Glonass channels - valid of Glonass SV only */
-  int    snrL1[24];          /* Important: all the 5 SV-specific fields must */
-  int    snrL2[24];          /* have the same SV-order */
+  double measdata[GNSS_MAXSATS][GNSSENTRY_NUMBER];  /* data fields */ 
+  int    dataflags[GNSS_MAXSATS];      /* GPSDF_xxx */
+  int    satellites[GNSS_MAXSATS];     /* SV - IDs */
+  int    channels[GNSS_MAXSATS];       /* Glonass channels - valid of Glonass SV only */
+  int    snrL1[GNSS_MAXSATS];          /* Important: all the 5 SV-specific fields must */
+  int    snrL2[GNSS_MAXSATS];          /* have the same SV-order */
 };