Changeset f4016fe in tol

Timestamp:

Feb 4, 2009, 7:56:20 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

f4a032f

Parents:

3993889

Message:

Checking allocated memory in bRd_rand and cRt_rand

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

File:

• tol/btol/vmatrix_type/vmat_stats.cpp (modified) (2 diffs)

tol/btol/vmatrix_type/vmat_stats.cpp

@@ -378 +378 @@
   ( nrow, ncol, nrow, CHOLMOD_REAL, common_);
   int k;
-  double* x = (double*)dense->x;
-  for(k=0; k<dense->nzmax; k++)
-  {
-    x[k] = xu.Random().Value(); 
+  if(dense)
+  {
+    double* x = (double*)dense->x;
+    for(k=0; k<dense->nzmax; k++)
+    {
+      x[k] = xu.Random().Value(); 
+    }
   }
   return(dense);
@@ -398 +401 @@
   cholmod_triplet* triplet = cholmod_allocate_triplet
   ( nrow, ncol, nzmax, 0, CHOLMOD_REAL, common_);
-  int k;
-  int* i = (int*)triplet->i;
-  int* j = (int*)triplet->j;
-  double* x = (double*)triplet->x;
-  for(k=0; k<nzmax; k++)
-  {
-    p.r_ = (int)::Round(iu.Random()).Value();
-    p.c_ = (int)::Round(ju.Random()).Value();
-  //BHashPairs::const_iterator fc = hashPairs.find(p);
-  //if(fc==hashPairs.end())
-    {
-      i[k] = p.r_; 
-      j[k] = p.c_; 
-      x[k] = dist.Random().Value(); 
-      if(x[k]!=0.0)
-      { 
-        triplet->nnz++; 
-      //hashPairs[p] = x[k];
+  if(triplet)
+  {
+    int k;
+    int* i = (int*)triplet->i;
+    int* j = (int*)triplet->j;
+    double* x = (double*)triplet->x;
+    for(k=0; k<nzmax; k++)
+    {
+      p.r_ = (int)::Round(iu.Random()).Value();
+      p.c_ = (int)::Round(ju.Random()).Value();
+    //BHashPairs::const_iterator fc = hashPairs.find(p);
+    //if(fc==hashPairs.end())
+      {
+        i[k] = p.r_; 
+        j[k] = p.c_; 
+        x[k] = dist.Random().Value(); 
+        if(x[k]!=0.0)
+        { 
+          triplet->nnz++; 
+        //hashPairs[p] = x[k];
+        }
       }
     }