* Bug #10271 fixed - Sparse: ordmmd checks its input argument

ordmmd now checks the consistency of the third input argument with the
input matrix defined by the two first input arguments.

Change-Id: If00bb325a3c0ceeb7ae7a8c314f3a61c14b03df4

diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X
index d589482..075db92 100644 (file)
--- a/scilab/CHANGES_5.5.X
+++ b/scilab/CHANGES_5.5.X
@@ -21,6 +21,9 @@ Scilab Bug Fixes
 
 * Bug #10234 fixed - reglin function moved from CACSD to Statistics module.
 
+* Bug #10271 fixed - ordmmd now checks the consistency of the third input argument with the
+                     input matrix defined by the two first input arguments.
+
 * Bug #10273 fixed - spchol help page now displays an example showing how to use its output arguments.
 
 * Bug #11571 fixed - x_mdialog did not let the Look&Feel select the window size.

diff --git a/scilab/modules/sparse/sci_gateway/fortran/sci_f_ordmmd.f b/scilab/modules/sparse/sci_gateway/fortran/sci_f_ordmmd.f
index 02d5174..0ca470a 100644 (file)
--- a/scilab/modules/sparse/sci_gateway/fortran/sci_f_ordmmd.f
+++ b/scilab/modules/sparse/sci_gateway/fortran/sci_f_ordmmd.f
@@ -1,10 +1,10 @@
 c Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 c Copyright (C) INRIA
-c 
+c
 c This file must be used under the terms of the CeCILL.
 c This source file is licensed as described in the file COPYING, which
 c you should have received as part of this distribution.  The terms
-c are also available at    
+c are also available at
 c http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
 
 c SCILAB function ordmmd
@@ -16,7 +16,7 @@ c
        nbvars=0
 c*****************************************************
 c      0-Check number of rhs and lhs arguments
-c*****************************************************       
+c*****************************************************
        minrhs=3
        maxrhs=3
        minlhs=3
@@ -37,9 +37,17 @@ c*******************************************************
        if(.not.getrhsvar(1,'i',m1,n1,l1)) return
        if(.not.getrhsvar(2,'i',m2,n2,l2)) return
        if(.not.getrhsvar(3,'i',m3,n3,l3)) return
-
+c*******************************************************
+c      1.1-Verify the input.
+c*******************************************************
+       if(istk(l3).ne.m1-1) then
+        buf = ' The provided "n" does not correspond to the matrix'//
+     + ' defined by xadj and iadj'
+        call error(9999)
+        return
+       endif
 c*****************************************************
-c      2-If necessary, create additional variables 
+c      2-If necessary, create additional variables
 c          (working arrays, default values, ...)
 c*****************************************************
 
@@ -47,7 +55,7 @@ c*****************************************************
        if(.not.createvar(k,  'i',istk(l3),1,l4)) return
        if(.not.createvar(k+1,'i',istk(l3),1,l5)) return
        if(.not.createvar(k+2,'i',1,1,l6)) return
-       if(.not.createvar(k+3,'i',4*istk(l3),1,l7)) return 
+       if(.not.createvar(k+3,'i',4*istk(l3),1,l7)) return
 c******************************************************
 c      3-Routine call
 c      stk  <-> double
@@ -61,7 +69,7 @@ c*****************************************************
 c******************************************************
 c      4-Display error message(s)
 c******************************************************
-       if(iflag .NE. 0) then 
+       if(iflag .NE. 0) then
         buf = ' insufficient working storage'
         call error(9999)
         return
@@ -81,4 +89,3 @@ c
        return
        end
 c                      ======================================
-

diff --git a/scilab/modules/sparse/tests/nonreg_tests/bug_10271.dia.ref b/scilab/modules/sparse/tests/nonreg_tests/bug_10271.dia.ref
new file mode 100644 (file)
index 0000000..281722f
--- /dev/null
+++ b/scilab/modules/sparse/tests/nonreg_tests/bug_10271.dia.ref
@@ -0,0 +1,22 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2013 - Scilab Enterprises - Paul Bignier
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- CLI SHELL MODE -->
+//
+// <-- Non-regression test for bug 10271 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=10271
+//
+// <-- Short Description -->
+// ordmmd now checks the consistency of the third input argument with the
+// input matrix defined by the two first input arguments.
+A = ReadHBSparse(SCI+"/modules/umfpack/examples/ex14.rua");
+[xadj, iadj, val] = sp2adj(A);
+n = floor(size(A, "r")/2);
+refMsg = msprintf(_(" The provided ""n"" does not correspond to the matrix defined by xadj and iadj"));
+assert_checkerror("[perm, invp, nofsub] = ordmmd(xadj, iadj, n);", refMsg);

diff --git a/scilab/modules/sparse/tests/nonreg_tests/bug_10271.tst b/scilab/modules/sparse/tests/nonreg_tests/bug_10271.tst
new file mode 100644 (file)
index 0000000..375ccf9
--- /dev/null
+++ b/scilab/modules/sparse/tests/nonreg_tests/bug_10271.tst
@@ -0,0 +1,25 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2013 - Scilab Enterprises - Paul Bignier
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- CLI SHELL MODE -->
+//
+// <-- Non-regression test for bug 10271 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=10271
+//
+// <-- Short Description -->
+// ordmmd now checks the consistency of the third input argument with the
+// input matrix defined by the two first input arguments.
+
+A = ReadHBSparse(SCI+"/modules/umfpack/examples/ex14.rua");
+
+[xadj, iadj, val] = sp2adj(A);
+n = floor(size(A, "r")/2);
+
+refMsg = msprintf(_(" The provided ""n"" does not correspond to the matrix defined by xadj and iadj"));
+assert_checkerror("[perm, invp, nofsub] = ordmmd(xadj, iadj, n);", refMsg);