mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

#2028 - Check for Cr or LF.

pull/2052/head
srcejon 2024-04-03 15:14:14 +01:00
rodzic 4d3e9889ec
commit eac144acba
2 zmienionych plików z 9 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
sdrbase/util/aprs.cpp
Wyświetl plik

@ -185,7 +185,7 @@ bool APRSPacket::decode(AX25Packet packet)
qDebug() << "APRSPacket::decode: AX.25 Destination did not match known regexp " << m_to; qDebug() << "APRSPacket::decode: AX.25 Destination did not match known regexp " << m_to;
} }
} else { } else {
qDebug() << "APRSPacket::decode: Not ARPS: type=" << packet.m_type << " pid=" << packet.m_pid << " length=" << packet.m_data.length(); qDebug() << "APRSPacket::decode: Not APRS: type=" << packet.m_type << " pid=" << packet.m_pid << " length=" << packet.m_data.length();
} }
return false; return false;

16
sdrbase/util/aprs.h
Wyświetl plik

@ -261,17 +261,17 @@ struct SDRBASE_API APRSPacket {
data.append(':'); data.append(':');
// #2028 - Protect against APRS-IS server command injection, by only sending up to first CR/LF // #2028 - Protect against APRS-IS server command injection, by only sending up to first CR/LF
int idx = m_data.indexOf("\r\n"); int idx = m_data.indexOf("\r");
if (idx >= 0) if (idx == -1) {
{ idx = m_data.indexOf("\n");
data.append(m_data.left(idx + 2));
} }
else if (idx >= 0) {
{ data.append(m_data.left(idx));
} else {
data.append(m_data); data.append(m_data);
data.append('\r');
data.append('\n');
} }
data.append('\r');
data.append('\n');
return data; return data;
} }