Changeset 11130 in ntrip for trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

Timestamp:

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

Author:

stuerze

Message:

Some fixes from security point of view

File:

• trunk/BNC/src/RTCM3/RTCM3Decoder.cpp (modified) (4 diffs)

trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

@@ -39 +39 @@
  * -----------------------------------------------------------------------*/
 
+#include <atomic>
 #include <iostream>
 #include <iomanip>
@@ -241 +242 @@
 /**
  * Frequency numbers of GLONASS with an offset of 100 to detect unset values.
- * Gets filled by ephemeris and data blocks and shared between different streams.
+ * Gets filled by ephemeris and data blocks and shared between different streams
+ * (MSM4/6 streams without channel numbers use those of an ephemeris stream).
+ * Atomic, as the streams are decoded in different threads.
  */
-static int GLOFreq[RTCM3_MSM_NUMSAT];
+static std::atomic<int> GLOFreq[RTCM3_MSM_NUMSAT];
 
 /*
@@ -1998 +2001 @@
   GETSTRING(antnum, antenna)
   if ((antnum > -1 && antnum < 265) &&
-      (_antType.empty() || strncmp(_antType.back()._descriptor, antenna, recnum) != 0)) {
+      (_antType.empty() || int(strlen(_antType.back()._descriptor)) != antnum ||
+       strncmp(_antType.back()._descriptor, antenna, antnum) != 0)) {
     _antType.push_back(t_antInfo());
     memcpy(_antType.back()._descriptor, antenna, antnum);
@@ -2017 +2021 @@
     GETSTRING(recsernum, recserialnum)
     if ((recnum > -1 && recnum < 265) &&
-        (_recType.empty() || strncmp(_recType.back()._descriptor, receiver, recnum) != 0)) {
+        (_recType.empty() || int(strlen(_recType.back()._descriptor)) != recnum ||
+         strncmp(_recType.back()._descriptor, receiver, recnum) != 0)) {
       _recType.push_back(t_recInfo());
       memcpy(_recType.back()._descriptor, receiver, recnum);