w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-08-12 02:32:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Protect against bounds error in qra64zap.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@7537 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-01-18 23:16:43 +00:00
parent 571cae29f0
commit 025cd28e0a
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libm65/qra64zap.f90
View File

@ -32,6 +32,8 @@ subroutine qra64zap(cx,cy,nzap)
nw=3 nw=3
do n=1,3 do n=1,3
nw=2*nw nw=2*nw
if(ipk-2*nw.lt.-1312) cycle
if(ipk+2*nw.gt. 1312) cycle
s1=maxval(s(ipk-2*nw:ipk-nw)) s1=maxval(s(ipk-2*nw:ipk-nw))
s2=maxval(s(ipk+nw:ipk+2*nw)) s2=maxval(s(ipk+nw:ipk+2*nw))
if(smax.gt.slimit .and. s1.lt.sbottom .and. s2.lt.sbottom) then if(smax.gt.slimit .and. s1.lt.sbottom .and. s2.lt.sbottom) then
@ -42,7 +44,6 @@ subroutine qra64zap(cx,cy,nzap)
ib=(i0+nw)*nadd ib=(i0+nw)*nadd
cx(ia:ib)=0. cx(ia:ib)=0.
cy(ia:ib)=0. cy(ia:ib)=0.
! print*,'!',nzap,ipk*df,nw
exit exit
endif endif
enddo enddo

2
mainwindow.cpp
View File

@ -1,4 +1,4 @@
//--------------------------------------------------------------- MainWindow //---------------------------------------------------------------- MainWindow
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include "devsetup.h" #include "devsetup.h"

5
plotter.cpp
View File

@ -139,19 +139,22 @@ void CPlotter::paintEvent(QPaintEvent *) // paintEvent()
if(f) { if(f) {
int x,y; int x,y;
float freq,sync; float freq,sync;
float slimit=6.0;
QPen pen0(Qt::red,1); QPen pen0(Qt::red,1);
painter2.setPen(pen0); painter2.setPen(pen0);
for(int i=0; i<99999; i++) { for(int i=0; i<99999; i++) {
f >> freq >> sync; f >> freq >> sync;
if(f.eof()) break; if(f.eof()) break;
x=(freq - m_ZoomStartFreq)/df; x=(freq - m_ZoomStartFreq)/df;
y=(sync-1.5)*2.0; y=(sync-slimit)*3.0;
if(y>0) {
if(y>15.0) y=15.0; if(y>15.0) y=15.0;
if(x>=0 and x<=w) painter2.drawLine(x,0,x,y); if(x>=0 and x<=w) painter2.drawLine(x,0,x,y);
x=XfromFreq(float(fQSO()+0.001*freq)); x=XfromFreq(float(fQSO()+0.001*freq));
painter1.setPen(pen0); painter1.setPen(pen0);
painter1.drawLine(x,0,x,y); painter1.drawLine(x,0,x,y);
} }
}
f.close(); f.close();
} }
m_bDecodeFinished=false; m_bDecodeFinished=false;