aboutsummaryrefslogtreecommitdiffstats
path: root/comms/linrad/files/patch-menu.c
blob: d14349287e82094692d24969dd10d28126c55b11 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
--- menu.c.orig	2014-11-04 10:25:00 UTC
+++ menu.c
@@ -965,11 +965,13 @@ if(parnum == SECOND_FFT_ATT_N)
   {
   k[0]=fft2_n-2;
   }
+// Please check if index is within constaints *BEFORE* using it.
+// This error was caught by GCC5 diagnostics marino@FreeBSD.org
 if(parnum == SECOND_FFT_VERNR)
   {
   i=0;
-  while( fft2_version[ui.rx_rf_channels-1][i+1] > 0 &&
-                                      i < MAX_FFT2_VERNR-1)i++;
+  while( i < MAX_FFT2_VERNR-1 && 
+         fft2_version[ui.rx_rf_channels-1][i+1] > 0)i++;
   if(mmx_present == 0)
     {
     while( fft_cntrl[fft2_version[ui.rx_rf_channels-1][i]].mmx != 0)i--;