diff --git a/Numeric/fullMatrix.cpp b/Numeric/fullMatrix.cpp index 3a73dda16c8d0d85e041aeffaa6ee11f638eb20e..eb75fa485ae4dc541ba85b3c69d07fb37ddd2521 100644 --- a/Numeric/fullMatrix.cpp +++ b/Numeric/fullMatrix.cpp @@ -296,8 +296,12 @@ bool fullMatrix<double>::invert(fullMatrix<double> &result) const { int M = size1(), N = size2(), lda = size1(), info; int *ipiv = new int[std::min(M, N)]; - if (result._own_data) - result.resize(M,N,false); + if (result.size2() != M || result.size1() != N) { + if (result._own_data || !result._data) + result.resize(M,N,false); + else + Msg::Fatal("FullMatrix: Bad dimension, I cannot write in proxy"); + } result.setAll(*this); F77NAME(dgetrf)(&M, &N, result._data, &lda, ipiv, &info); if(info == 0){ diff --git a/Numeric/fullMatrix.h b/Numeric/fullMatrix.h index a5cc2a8b4fa025d23ab679f1678fa9fe4f042ca2..f278fe983630b7817a4c143929ae05875337f976 100644 --- a/Numeric/fullMatrix.h +++ b/Numeric/fullMatrix.h @@ -474,7 +474,8 @@ class fullMatrix if(resetValue) setAll(scalar(0.)); return false; // no reallocation - } void setAsProxy(const fullMatrix<scalar> &original) + } + void setAsProxy(const fullMatrix<scalar> &original) { if(_data && _own_data) delete [] _data;