GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-09-25 15:53:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some illegal memory access in sparse conservativeResize()

Browse Source
This commit is contained in:
Jitse Niesen 2012-07-20 22:51:51 +01:00
parent 6bf49ceac2
commit 907f4562ac
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Eigen/src/SparseCore/SparseMatrix.h
View File

@ -543,11 +543,11 @@ class SparseMatrix
// Change the m_innerNonZeros in case of a decrease of inner size // Change the m_innerNonZeros in case of a decrease of inner size
if (m_innerNonZeros && innerChange < 0) { if (m_innerNonZeros && innerChange < 0) {
for(Index i = 0; i<m_outerSize; i++) for(Index i = 0; i < m_outerSize + (std::min)(outerChange, Index(0)); i++)
{ {
Index &n = m_innerNonZeros[i]; Index &n = m_innerNonZeros[i];
Index start = m_outerIndex[i]; Index start = m_outerIndex[i];
while (n >= 0 && m_data.index(start+n-1) >= newInnerSize) --n; while (n > 0 && m_data.index(start+n-1) >= newInnerSize) --n;
} }
} }
@ -560,9 +560,11 @@ class SparseMatrix
Index *newOuterIndex = static_cast<Index*>(std::realloc(m_outerIndex, (m_outerSize + outerChange + 1) * sizeof(Index))); Index *newOuterIndex = static_cast<Index*>(std::realloc(m_outerIndex, (m_outerSize + outerChange + 1) * sizeof(Index)));
if (!newOuterIndex) internal::throw_std_bad_alloc(); if (!newOuterIndex) internal::throw_std_bad_alloc();
m_outerIndex = newOuterIndex; m_outerIndex = newOuterIndex;
Index last = m_outerSize == 0 ? 0 : m_outerIndex[m_outerSize]; if (outerChange > 0) {
for(Index i=m_outerSize; i<m_outerSize+outerChange+1; i++) Index last = m_outerSize == 0 ? 0 : m_outerIndex[m_outerSize];
for(Index i=m_outerSize; i<m_outerSize+outerChange+1; i++)
m_outerIndex[i] = last; m_outerIndex[i] = last;
}
m_outerSize += outerChange; m_outerSize += outerChange;
} }