Changeset 11128 in ntrip for trunk/BNC/src/bncnetqueryudp.cpp

Timestamp:

Oct 24, 2026, 11:37:52 PM (7 days ago)

Author:

stuerze

Message:

Some fixes from security point of view

File:

• trunk/BNC/src/bncnetqueryudp.cpp (modified) (2 diffs)

trunk/BNC/src/bncnetqueryudp.cpp

@@ -75 +75 @@
 void bncNetQueryUdp::waitForReadyRead(QByteArray& outData) {
 
-  // Wait Loop
-  // ---------
-  if (!_udpSocket->hasPendingDatagrams()) {
-    _eventLoop->exec();
-  }
+  while (true) {
 
-  // Append Data
-  // -----------
-  QByteArray datagram;
-  datagram.resize(_udpSocket->pendingDatagramSize());
-  _udpSocket->readDatagram(datagram.data(), datagram.size());
+    // Wait Loop
+    // ---------
+    if (!_udpSocket->hasPendingDatagrams()) {
+      _eventLoop->exec();
+      if (!_udpSocket->hasPendingDatagrams()) { // stopped
+        return;
+      }
+    }
 
-  if (datagram.size() > 12) {
-    outData.append(datagram.mid(12));
-  }
-  else {
-    _status = error;
+    // Append Data, only from the caster (anybody else could feed in data)
+    // -------------------------------------------------------------------
+    QByteArray datagram;
+    QHostAddress sender;
+    datagram.resize(_udpSocket->pendingDatagramSize());
+    _udpSocket->readDatagram(datagram.data(), datagram.size(), &sender);
+    if (!sender.isEqual(_address, QHostAddress::ConvertV4MappedToIPv4)) {
+      continue;
+    }
+
+    if (datagram.size() > 12) {
+      outData.append(datagram.mid(12));
+    }
+    else {
+      _status = error;
+    }
+    return;
   }
 }
@@ -156 +167 @@
 
     _udpSocket->writeDatagram(rtpbuffer, 12 + reqStr.size(), _address, _port);
+    free(rtpbuffer);
 
     // Wait for Reply, read Session Number