Compare commits

...

3 Commits

Author SHA1 Message Date
Edouard Griffiths a31e83d43c
Merge pull request #2096 from srcejon/freq_scanner
Two bug fixes
2024-04-30 15:28:52 +02:00
srcejon 39760146d4 ValueDial: Fix array being accessed out of range. 2024-04-30 09:33:54 +01:00
srcejon 4f2b03646f AIS: Fix string decoding in safetey messages. #2094 2024-04-30 09:32:22 +01:00
2 changed files with 3 additions and 3 deletions

View File

@ -502,7 +502,7 @@ AISSafetyMessage::AISSafetyMessage(QByteArray ba) :
m_sequenceNumber = ba[4] & 0x3;
m_destinationId = ((ba[5] & 0xff) << 22) | ((ba[6] & 0xff) << 14) | ((ba[7] & 0xff) << 6) | ((ba[8] >> 2) & 0x3f);
m_retransmitFlag = (ba[8] >> 1) & 0x1;
m_safetyRelatedText = AISMessage::getString(ba, 9, 0, (ba.size() - 9) * 8 / 6);
m_safetyRelatedText = AISMessage::getString(ba, 9, 8, (ba.size() - 9) * 8 / 6);
}
QString AISSafetyMessage::toString()
@ -518,7 +518,7 @@ AISSafetyAck::AISSafetyAck(QByteArray ba) :
AISSafetyBroadcast::AISSafetyBroadcast(QByteArray ba) :
AISMessage(ba)
{
m_safetyRelatedText = AISMessage::getString(ba, 5, 0, (ba.size() - 6) * 8 / 6);
m_safetyRelatedText = AISMessage::getString(ba, 5, 8, (ba.size() - 5) * 8 / 6);
}
QString AISSafetyBroadcast::toString()

View File

@ -601,7 +601,7 @@ void ValueDial::keyPressEvent(QKeyEvent *value)
emit changed(m_valueNew);
m_cursor++;
if (m_text[m_cursor] == m_groupSeparator) {
if ((m_cursor >= 0) && (m_cursor < m_text.size()) && (m_text[m_cursor] == m_groupSeparator)) {
m_cursor++;
}