devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in SparseBlock which caused a segfault in sparse_extra_3 test

Browse Source
This commit is contained in:
Christoph Hertzberg
2014-10-30 21:34:10 +01:00
parent 883168ed94
commit 4ec2f07a5b
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Eigen/src/SparseCore/SparseBlock.h
View File

@@ -466,10 +466,8 @@ namespace internal {
inline GenericSparseBlockInnerIteratorImpl& operator++() inline GenericSparseBlockInnerIteratorImpl& operator++()
{ {
// search next non-zero entry // search next non-zero entry
while(m_outerPos<m_end) while(++m_outerPos<m_end)
{ {
m_outerPos++;
if(m_outerPos==m_end) break;
typename XprType::InnerIterator it(m_block.m_matrix, m_outerPos); typename XprType::InnerIterator it(m_block.m_matrix, m_outerPos);
// search for the key m_innerIndex in the current outer-vector // search for the key m_innerIndex in the current outer-vector
while(it && it.index() < m_innerIndex) ++it; while(it && it.index() < m_innerIndex) ++it;
@@ -580,9 +578,8 @@ public:
inline OuterVectorInnerIterator& operator++() inline OuterVectorInnerIterator& operator++()
{ {
// search next non-zero entry // search next non-zero entry
while(m_outerPos<m_end) while(++m_outerPos<m_end)
{ {
m_outerPos++;
EvalIterator it(m_eval.m_argImpl, m_outerPos); EvalIterator it(m_eval.m_argImpl, m_outerPos);
// search for the key m_innerIndex in the current outer-vector // search for the key m_innerIndex in the current outer-vector
while(it && it.index() < m_innerIndex) ++it; while(it && it.index() < m_innerIndex) ++it;