From 2ac0b787399df718dc61219145f44a6ae99813aa Mon Sep 17 00:00:00 2001 From: Adam Shapiro Date: Tue, 23 Feb 2021 21:32:39 +0000 Subject: Fixed sparse conservativeResize() when both num cols and rows decreased. The previous implementation caused a buffer overflow trying to calculate non- zero counts for columns that no longer exist. --- test/sparse_basic.cpp | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'test') diff --git a/test/sparse_basic.cpp b/test/sparse_basic.cpp index 5f8762172..17897fd61 100644 --- a/test/sparse_basic.cpp +++ b/test/sparse_basic.cpp @@ -587,30 +587,38 @@ template void sparse_basic(const SparseMatrixType& re inc.push_back(std::pair(3,2)); inc.push_back(std::pair(3,0)); inc.push_back(std::pair(0,3)); - + inc.push_back(std::pair(0,-1)); + inc.push_back(std::pair(-1,0)); + inc.push_back(std::pair(-1,-1)); + for(size_t i = 0; i< inc.size(); i++) { StorageIndex incRows = inc[i].first; StorageIndex incCols = inc[i].second; SparseMatrixType m1(rows, cols); DenseMatrix refMat1 = DenseMatrix::Zero(rows, cols); initSparse(density, refMat1, m1); - + + SparseMatrixType m2 = m1; + m2.makeCompressed(); + m1.conservativeResize(rows+incRows, cols+incCols); + m2.conservativeResize(rows+incRows, cols+incCols); refMat1.conservativeResize(rows+incRows, cols+incCols); if (incRows > 0) refMat1.bottomRows(incRows).setZero(); if (incCols > 0) refMat1.rightCols(incCols).setZero(); - + VERIFY_IS_APPROX(m1, refMat1); - + VERIFY_IS_APPROX(m2, refMat1); + // Insert new values if (incRows > 0) m1.insert(m1.rows()-1, 0) = refMat1(refMat1.rows()-1, 0) = 1; if (incCols > 0) m1.insert(0, m1.cols()-1) = refMat1(0, refMat1.cols()-1) = 1; - + VERIFY_IS_APPROX(m1, refMat1); - - + + } } -- cgit v1.2.3