Attachment 156048 Details for Bug 199737 – Fix linrad on latest gcc

[patch] Fix linrad on latest gcc

linrad.patch (text/plain), 1.88 KB, created by John Marino on 2015-04-27 17:46:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Marino

Created: 2015-04-27 17:46:48 UTC

Size: 1.88 KB

patch

obsolete

>Index: comms/linrad/Makefile
>===================================================================
>--- comms/linrad/Makefile	(revision 384799)
>+++ comms/linrad/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	linrad
> PORTVERSION=	4.02
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	comms hamradio
> MASTER_SITES=	http://www.nitehawk.com/sm5bsz/linuxdsp/archive/\
> 		http://g7rau.demon.co.uk/sm5bsz/linuxdsp/archive/\
>Index: comms/linrad/files/patch-caliq.c
>===================================================================
>--- comms/linrad/files/patch-caliq.c	(revision 0)
>+++ comms/linrad/files/patch-caliq.c	(working copy)
>@@ -0,0 +1,15 @@
>+The z array must always been in multiples of four, not two.  It is populated
>+four at a time (j, j+1, j+2, j+3).  Without this fix, it breaks on Werror with
>+array subscript out of bounds on line 550.
>+
>+--- caliq.c.orig	2014-11-04 10:25:00 UTC
>++++ caliq.c
>+@@ -391,7 +391,7 @@ char s[80];
>+ int seg,color;
>+ int ia,ib;
>+ int i,j,k,m,n,mm,errskip;
>+-float z[2*MAX_ADCHAN];
>++float z[4*MAX_ADCHAN];
>+ float t1,t2,t3;
>+ caliq_clear_flag=TRUE;
>+ clear_fft1_filtercorr();
>Index: comms/linrad/files/patch-menu.c
>===================================================================
>--- comms/linrad/files/patch-menu.c	(revision 0)
>+++ comms/linrad/files/patch-menu.c	(working copy)
>@@ -0,0 +1,16 @@
>+Please check if index is within constaints *BEFORE* using it.
>+This error was caught by GCC5 diagnostics
>+
>+--- menu.c.orig	2014-11-04 10:25:00 UTC
>++++ menu.c
>+@@ -968,8 +968,8 @@ if(parnum == SECOND_FFT_ATT_N)
>+ 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--;

Actions: View | Diff

Attachments on bug 199737: 156048