bug fix in SparseSelfAdjointTimeDenseProduct for empty rows or columns

2 files changed, 4 insertions, 13 deletions

diff --git a/Eigen/src/SparseCore/SparseMatrix.h b/Eigen/src/SparseCore/SparseMatrix.h
index 87a7066b3..87ff2ecf4 100644
--- a/Eigen/src/SparseCore/SparseMatrix.h
+++ b/Eigen/src/SparseCore/SparseMatrix.h
@@ -556,24 +556,15 @@ class SparseMatrix
     #ifndef EIGEN_PARSED_BY_DOXYGEN
     template<typename Lhs, typename Rhs>
     inline SparseMatrix& operator=(const SparseSparseProduct<Lhs,Rhs>& product)
-    {
-      initAssignment(product);
-      return Base::operator=(product);
-    }
+    { return Base::operator=(product); }
     
     template<typename OtherDerived>
     inline SparseMatrix& operator=(const ReturnByValue<OtherDerived>& other)
-    {
-      initAssignment(other.derived());
-      return Base::operator=(other.derived());
-    }
+    { return Base::operator=(other.derived()); }
     
     template<typename OtherDerived>
     inline SparseMatrix& operator=(const EigenBase<OtherDerived>& other)
-    {
-      initAssignment(other.derived());
-      return Base::operator=(other.derived());
-    }
+    { return Base::operator=(other.derived()); }
     #endif
 
     template<typename OtherDerived>
diff --git a/Eigen/src/SparseCore/SparseSelfAdjointView.h b/Eigen/src/SparseCore/SparseSelfAdjointView.h
index 0768b696a..0becb8073 100644
--- a/Eigen/src/SparseCore/SparseSelfAdjointView.h
+++ b/Eigen/src/SparseCore/SparseSelfAdjointView.h
@@ -229,7 +229,7 @@ class SparseSelfAdjointTimeDenseProduct
         LhsInnerIterator i(m_lhs,j);
         if (ProcessSecondHalf)
         {
-          while (i.index()<j) ++i;
+          while (i && i.index()<j) ++i;
           if(i && i.index()==j)
           {
             dest.row(j) += i.value() * m_rhs.row(j);