Check for integer overflow when copying sizes from SuiteSparse matrices.

* liboctave/array/CSparse.cc, dSparse.cc (fsolve), liboctave/numeric/sparse-chol.cc (sparse_chol_rep::P), liboctave/numeric/sparse-qr.cc (sparse_qr<SparseMatrix>::sparse_qr_rep::R): Use "from_size_t" instead of casting nrow and ncol from SuiteSparse matrix structures without any overflow check.
gnu-octave · Sep 8, 2023 · 574afd3 · 574afd3
1 parent ebad964
commit 574afd3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/liboctave/array/CSparse.cc b/liboctave/array/CSparse.cc
@@ -6040,8 +6040,8 @@ SparseComplexMatrix::fsolve (MatrixType& mattype, const SparseMatrix& b,
               cholmod_sparse *X = CHOLMOD_NAME(spsolve) (CHOLMOD_A, L, B, cm);
 
               retval = SparseComplexMatrix
-                       (static_cast<octave_idx_type> (X->nrow),
-                        static_cast<octave_idx_type> (X->ncol),
+                       (octave::from_size_t (X->nrow),
+                        octave::from_size_t (X->ncol),
                         octave::from_suitesparse_long (CHOLMOD_NAME(nnz)
                                                        (X, cm)));
               for (octave_idx_type j = 0;
@@ -6550,8 +6550,8 @@ SparseComplexMatrix::fsolve (MatrixType& mattype, const SparseComplexMatrix& b,
               cholmod_sparse *X = CHOLMOD_NAME(spsolve) (CHOLMOD_A, L, B, cm);
 
               retval = SparseComplexMatrix
-                       (static_cast<octave_idx_type> (X->nrow),
-                        static_cast<octave_idx_type> (X->ncol),
+                       (octave::from_size_t (X->nrow),
+                        octave::from_size_t (X->ncol),
                         octave::from_suitesparse_long (CHOLMOD_NAME(nnz)
                                                        (X, cm)));
               for (octave_idx_type j = 0;

diff --git a/liboctave/array/dSparse.cc b/liboctave/array/dSparse.cc
@@ -6054,8 +6054,8 @@ SparseMatrix::fsolve (MatrixType& mattype, const SparseMatrix& b,
               cholmod_sparse *X = CHOLMOD_NAME(spsolve) (CHOLMOD_A, L, B, cm);
 
               retval = SparseMatrix
-                       (static_cast<octave_idx_type> (X->nrow),
-                        static_cast<octave_idx_type> (X->ncol),
+                       (octave::from_size_t (X->nrow),
+                        octave::from_size_t (X->ncol),
                         octave::from_suitesparse_long (CHOLMOD_NAME(nnz)
                                                        (X, cm)));
               for (octave_idx_type j = 0;
@@ -6549,8 +6549,8 @@ SparseMatrix::fsolve (MatrixType& mattype, const SparseComplexMatrix& b,
               cholmod_sparse *X = CHOLMOD_NAME(spsolve) (CHOLMOD_A, L, B, cm);
 
               retval = SparseComplexMatrix
-                       (static_cast<octave_idx_type> (X->nrow),
-                        static_cast<octave_idx_type> (X->ncol),
+                       (octave::from_size_t (X->nrow),
+                        octave::from_size_t (X->ncol),
                         octave::from_suitesparse_long (CHOLMOD_NAME(nnz)
                                                        (X, cm)));
               for (octave_idx_type j = 0;

diff --git a/liboctave/numeric/sparse-chol.cc b/liboctave/numeric/sparse-chol.cc
@@ -105,8 +105,7 @@ class sparse_chol<chol_type>::sparse_chol_rep
   octave_idx_type P () const
   {
 #if defined (HAVE_CHOLMOD)
-    return (m_minor_p == static_cast<octave_idx_type> (m_L->ncol) ?
-            0 : m_minor_p + 1);
+    return (m_minor_p == from_size_t (m_L->ncol) ? 0 : m_minor_p + 1);
 #else
     return 0;
 #endif

diff --git a/liboctave/numeric/sparse-qr.cc b/liboctave/numeric/sparse-qr.cc
@@ -634,8 +634,8 @@ sparse_qr<SparseMatrix>::sparse_qr_rep::R (bool econ) const
 {
 #if (defined (HAVE_SPQR) && defined (HAVE_CHOLMOD))
 
-  octave_idx_type nr = static_cast<octave_idx_type> (m_R->nrow);
-  octave_idx_type nc = static_cast<octave_idx_type> (m_R->ncol);
+  octave_idx_type nr = from_size_t (m_R->nrow);
+  octave_idx_type nc = from_size_t (m_R->ncol);
   octave_idx_type nz
     = from_suitesparse_long
       (cholmod_l_nnz (m_R, const_cast<cholmod_common *> (&m_cc)));