The change committed to decodedtext.cpp fixes a crash that occurred when processing certain isync=2 decodes. Is this the right fix? Other changes are minor code cleanups.

This commit is contained in:
Steve Franke 2018-07-17 17:48:23 -05:00
parent 54b3541012
commit 59f713ba76
3 changed files with 3 additions and 8 deletions

View File

@ -22,7 +22,7 @@ DecodedText::DecodedText (QString const& the_string)
{
if (message_.length() >= 1)
{
message_ = message_.left (21).remove (QRegularExpression {"[<>]"});
message_ = message_.left (36).remove (QRegularExpression {"[<>]"});
int i1 = message_.indexOf ('\r');
if (i1 > 0)
{

View File

@ -321,12 +321,7 @@ subroutine ft8b_2(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, &
write(c77,'(77i1)') message77
read(c77(72:74),'(b3)') n3
read(c77(75:77),'(b3)') i3
!write(*,'(77i1)') message77
call unpack77(c77,msg37)
!TEST ONLY
call pack77(msg37,i3p,n3p,c77)
! Should we test for consistency between i3,n3 from codeword and i3,n3 from unpack77?
!write(*,*) i3,n3,i3p,n3p,msg37
call genft8_174_91(msg37,i3,n3,msgsent37,msgbits,itone)
if(lsubtract) call subtractft8(dd0,itone,f1,xdt)
xsig=0.0

View File

@ -139,8 +139,8 @@ contains
endif
! write(81,1004) nutc,ncand,icand,ipass,iaptype,iappass, &
! nharderrors,dmin,hd,min(sync,999.0),nint(xsnr), &
! xdt,nint(f1),msg37,isync,nbadcrc
!1004 format(i6.6,2i4,3i2,i3,3f6.1,i4,f6.2,i5,2x,a37,i4,i4)
! xdt,nint(f1),msg37,isync
!1004 format(i6.6,2i4,3i2,i3,3f6.1,i4,f6.2,i5,2x,a37,i4)
! flush(81)
if(.not.ldupe .and. associated(this%callback)) then
! print*,'nharderrors:',nharderrors