Index: trunk/clock_and_orbit/clock_orbit_rtcm.c
===================================================================
--- trunk/clock_and_orbit/clock_orbit_rtcm.c	(revision 1819)
+++ trunk/clock_and_orbit/clock_orbit_rtcm.c	(revision 1826)
@@ -3,5 +3,5 @@
         Name:           clock_orbit_rtcm.c
         Project:        RTCM3
-        Version:        $Id: clock_orbit_rtcm.c,v 1.9 2009/04/24 09:17:24 weber Exp $
+        Version:        $Id: clock_orbit_rtcm.c,v 1.10 2009/04/30 09:14:40 weber Exp $
         Authors:        Dirk Stöcker
         Description:    state space approach for RTCM3
@@ -79,4 +79,6 @@
     blockstart[1] |= len>>8; \
     blockstart[2] = len; \
+    if(len > 1023) \
+      return 0; \
     len = CRC24(len+3, (const unsigned char *) blockstart); \
     ADDBITS(24, len) \
@@ -144,5 +146,6 @@
     gpscl = 1;
   if(co->NumberOfGPSSat && co->ClockDataSupplied && co->OrbitDataSupplied
-  && (type == COTYPE_AUTO || type == COTYPE_GPSCOMBINED))
+  && (type == COTYPE_AUTO || type == COTYPE_GPSCOMBINED)
+  && co->NumberOfGPSSat < 28)
   {
     gpsco = 1; gpsor = 0; gpscl = 0;
@@ -397,5 +400,4 @@
     ENDBLOCK
   }
-
 
   return ressize;