From beceb766ff7dcca0a96a53f50f116774ccf9b268 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 20 Jan 2017 18:50:13 +0000 Subject: [PATCH] Protect against bounds error when invalid frequencies are presented to decoder. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@7547 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- libm65/qra64b.f90 | 4 +++- mainwindow.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libm65/qra64b.f90 b/libm65/qra64b.f90 index a8b43c1ea..adb15a132 100644 --- a/libm65/qra64b.f90 +++ b/libm65/qra64b.f90 @@ -15,6 +15,8 @@ subroutine qra64b(nutc,nqd,ikhz,mousedf,ntol,xpol,mycall_12,hiscall_12, & df=96000.0/NFFT1 k0=(ikhz-75.170)*1000.0/df nh=nfft2/2 + if(k0.lt.nh .or. k0.gt.NFFT1-nh) go to 900 + fac=1.0/NFFT2 cx(0:nh)=ca(k0:k0+nh) cx(nh+1:NFFT2-1)=ca(k0-nh+1:k0-1) @@ -36,5 +38,5 @@ subroutine qra64b(nutc,nqd,ikhz,mousedf,ntol,xpol,mycall_12,hiscall_12, & hiscall_12,hisgrid_6,mode64,nwrite_qra64) close(17) - return +900 return end subroutine qra64b diff --git a/mainwindow.cpp b/mainwindow.cpp index 5cd2b3604..cf8794062 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//-------------------------------------------------------------- MainWindow +//--------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h"