From 39adad9e5382cd07215dfcad3c1210e4a778ef0d Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Wed, 11 Jul 2001 15:16:20 +0000 Subject: add a patch to fix a bug in the fft() function where arguments are not checked correctly. Can cause scilab to crash instead of printing a warning. Patch came from Giuseppe Allodi posted to comp.soft-sys.math.scilab. bump to 2.6nb1. --- math/scilab/Makefile | 6 +++--- math/scilab/distinfo | 3 ++- math/scilab/patches/patch-ag | 30 ++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 math/scilab/patches/patch-ag (limited to 'math') diff --git a/math/scilab/Makefile b/math/scilab/Makefile index 68e53ebbba3..99c91c70b90 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.22 2001/04/08 16:25:27 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.23 2001/07/11 15:16:20 dmcmahill Exp $ # DISTNAME= scilab-2.6.src -PKGNAME= scilab-2.6 -WRKSRC= ${WRKDIR}/${PKGNAME} +PKGNAME= scilab-2.6nb1 +WRKSRC= ${WRKDIR}/${DISTNAME:.src=} CATEGORIES= math MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/distributions/ diff --git a/math/scilab/distinfo b/math/scilab/distinfo index 2ca058aa7e9..6a7c81b28c9 100644 --- a/math/scilab/distinfo +++ b/math/scilab/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 08:45:44 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/07/11 15:16:21 dmcmahill Exp $ SHA1 (scilab-2.6.src.tar.gz) = fa4e0df9e0500488f59e488ea20214c200add4d7 Size (scilab-2.6.src.tar.gz) = 6729707 bytes @@ -8,3 +8,4 @@ SHA1 (patch-ac) = f1f5f90b7f0c3ca2cf5dd0e602395a0b4c56cd1b SHA1 (patch-ad) = b44dc5cfc08a3c91c6230bff9cedd28d3cc62427 SHA1 (patch-ae) = 5dc250f876b0932adbc7f2771843f71440c9038e SHA1 (patch-af) = 5cf0fe4d413607d6ff25aeb30f5a32a03fb9e2ed +SHA1 (patch-ag) = ba61ea2d65f4e4dfef8e32b1383a956140f61871 diff --git a/math/scilab/patches/patch-ag b/math/scilab/patches/patch-ag new file mode 100644 index 00000000000..b2fe6a97aaa --- /dev/null +++ b/math/scilab/patches/patch-ag @@ -0,0 +1,30 @@ +$NetBSD: patch-ag,v 1.5 2001/07/11 15:16:21 dmcmahill Exp $ + +fixes a bug in the fft() function where the 4th input argument was not checked, +and an improper value, like 0 or a string - e.g. fft(1:4,-1:1,0) -, +crashed scilab. + +Patch is from Giuseppe Allodi +posted to comp.soft-sys.math.scilab + +--- routines/signal/sigelm.f.orig Mon Feb 5 10:19:36 2001 ++++ routines/signal/sigelm.f Sun Jun 3 18:52:29 2001 +@@ -134,8 +134,18 @@ + 22 continue + c rhs=4 + ilinc=iadr(lstk(top)) ++ if (istk(ilinc).ne.1) then !protect the 4th arg. (GA 2001) ++ err=4 ++ call error(53) ++ return ++ endif + linc=sadr(ilinc+4) + nspn=int(stk(linc)) ++ if (nspn.eq.0) then !protect the 4th arg. (GA 2001) ++ err=4 ++ call error(36) ++ return ++ endif + top=top-1 + iln=iadr(lstk(top)) + ln=sadr(iln+4) -- cgit v1.2.3