Changeset 2291fa7 in tol

Timestamp:

Nov 10, 2008, 6:41:53 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

8e64dcd

Parents:

55b7091

Message:

Ensuring dimensions in Zeros, Eye and Sub methods

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@135 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/vmatrix_type/vmat_convert.cpp (modified) (6 diffs)

tol/btol/vmatrix_type/vmat_convert.cpp

@@ -728 +728 @@
 {
   Delete();
+  if((nrow<0)||(ncol<0))
+  {
+    err_invalid_dimensions("Eye",nrow,ncol);
+    return;
+  }
   bool isCol = v.Columns()==1;
   bool isRow = v.Rows   ()==1;
@@ -770 +775 @@
 {
   Delete();
+  if((nrow<0)||(ncol<0))
+  {
+    err_invalid_dimensions("Eye",nrow,ncol);
+    return;
+  }
   bool lower = diag<=0;
   int k, n = Maximum(nrow, ncol);
@@ -805 +815 @@
 {
   Delete();
+  if((nrow<0)||(ncol<0))
+  {
+    err_invalid_dimensions("Eye",nrow,ncol);
+    return;
+  }
   switch(c) {
   case(ESC_blasRdense  ) :
@@ -824 +839 @@
 {
   Delete();
+  if((nrow<0)||(ncol<0))
+  {
+    err_invalid_dimensions("Zeros",nrow,ncol);
+    return;
+  }
   switch(c) {
   case(ESC_blasRdense  ) :
@@ -1048 +1068 @@
 {
   int i, j;
+  if((rows<0)||(cols<0))
+  {
+    err_invalid_dimensions("Sub",rows,cols);
+    return(-1);
+  }
   BArray<int> r(rows);
   BArray<int> c(cols);
@@ -1061 +1086 @@
 {
   BVMat aux;
+  if((rows<0)||(cols<0))
+  {
+    err_invalid_dimensions("Sub",rows,cols);
+    return(aux);
+  }
   Sub(i0,j0,rows,cols,aux);
   return(aux);