w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-01 20:57:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't use "appendage" ~ or ! on decoded lines. Protect against bad read in genft8_174_91.

Browse Source
This commit is contained in:
Joe Taylor 2018-09-02 18:55:13 -04:00
parent ed791f26dd
commit ca2c1a2b8b
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
displaytext.cpp
View File

@ -192,7 +192,7 @@ QString DisplayText::appendWorkedB4(QString message, QString const& callsign, QS
if (!countryWorkedBefore) { if (!countryWorkedBefore) {
// therefore not worked call either // therefore not worked call either
appendage += "!"; // appendage += "!";
*bg = m_color_DXCC; *bg = m_color_DXCC;
} else { } else {
if(!countryB4onBand) { if(!countryB4onBand) {
@ -206,14 +206,14 @@ QString DisplayText::appendWorkedB4(QString message, QString const& callsign, QS
} else { } else {
if (!callWorkedBefore) { if (!callWorkedBefore) {
// but have worked the country // but have worked the country
appendage += "~"; // appendage += "~";
*bg = m_color_NewCall; *bg = m_color_NewCall;
} else { } else {
if(!callB4onBand) { if(!callB4onBand) {
appendage += "~"; // appendage += "~";
*bg = m_color_NewCallBand; *bg = m_color_NewCallBand;
} else { } else {
appendage += " "; // have worked this call before // appendage += " "; // have worked this call before
*bg = m_color_CQ; *bg = m_color_CQ;
} }
} }

6
lib/ft8/genft8_174_91.f90
View File

@ -16,8 +16,10 @@ subroutine genft8_174_91(msg,i3,n3,msgsent,msgbits,itone)
call pack77(msg,i3,n3,c77) call pack77(msg,i3,n3,c77)
call unpack77(c77,msgsent) call unpack77(c77,msgsent)
read(c77,'(77i1)') msgbits read(c77,'(77i1)',err=1) msgbits
call encode174_91(msgbits,codeword) !Encode the test message go to 2
1 write(81,*) msg,c77 ; flush(81)
2 call encode174_91(msgbits,codeword) !Encode the test message
! Message structure: S7 D29 S7 D29 S7 ! Message structure: S7 D29 S7 D29 S7
itone(1:7)=icos7 itone(1:7)=icos7