Changeset 11130 in ntrip for trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h

Timestamp:

Oct 28, 2026, 9:32:30 AM (5 days ago)

Author:

stuerze

Message:

Some fixes from security point of view

File:

• trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h (modified) (1 diff)

trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h

@@ -605 +605 @@
 #define E_NADIR_ANGLE_DEPENDENT_CORR_RANGE_EXTENSION(a) ADDBITS(4,  a)                      /* DF+015 (new RTCM) to extend DF+021*/
 #define E_SATELLITE_SET_INDICATOR(a)                    ADDBITS(1,  a)                      /* DF+016 (new RTCM) */
-/* ADDBITS' mask "(1<<a)-1" uses a 32-bit int literal, so a plain
-   ADDBITS(64, a) is broken the same way GETSSRBITS(a, 64) was on decode
-   (see D_SATELLITE_MASK) - here even ADDBITS(32, ...) is unsafe, since
-   shifting a 32-bit int by exactly its own width is undefined behavior
-   too. Stay well clear of that edge by writing four 16-bit chunks. */
+/* ADDBITS handles up to 56 bits, so the 64-bit mask is written as two
+   32-bit halves (as GETSSRBITS(a, 64) does not work either, see
+   D_SATELLITE_MASK). */
 #define E_SATELLITE_MASK(a)                             { \
   uint64_t mask64_ = (a); \
-  ADDBITS(16, (mask64_ >> 48) & 0xFFFFU) \
-  ADDBITS(16, (mask64_ >> 32) & 0xFFFFU) \
-  ADDBITS(16, (mask64_ >> 16) & 0xFFFFU) \
-  ADDBITS(16,  mask64_        & 0xFFFFU) \
+  ADDBITS(32, mask64_ >> 32) \
+  ADDBITS(32, mask64_ & 0xFFFFFFFFU) \
 }                                                                                           /* DF394 */
 #define E_FREQUENCY_SET_INDICATOR(a)                    ADDBITS(1,  a)                      /* DF+017 (new RTCM) */