Changeset f9cb4df in tol

Timestamp:

Aug 15, 2010, 10:13:52 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

94aae25

Parents:

e3ade54

Message:

Avoiding invalid access to non initialized hashes

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

File:

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

tol/btol/vmatrix_type/vmat_subtypes.cpp

@@ -41 +41 @@
 // Static functions
 ////////////////////////////////////////////////////////////////////////////////
+static BHashCodeName* hashCodeName_ = NULL;
+static BHashCSysName* hashCSysName_ = NULL;
+static BHashCFacName* hashCFacName_ = NULL;
+static BHashDefCode*  hashDefCode_  = NULL;
+static BHashConvert*  hashConvert_  = NULL;
+static BHashProduct*  hashProduct_  = NULL;
+static BHashCholSol*  hashCholSol_  = NULL;
+static BHashCholFac*  hashCholFac_  = NULL;
+
+static bool InitialiceHashes()
+{
+  static bool done_ = false;
+  if(!done_)
+  {
+    done_ = true;
+    hashCodeName_ = new BHashCodeName;
+    hashCSysName_ = new BHashCSysName;
+    hashCFacName_ = new BHashCFacName;
+    hashDefCode_  = new BHashDefCode;
+    hashConvert_  = new BHashConvert;
+    hashProduct_  = new BHashProduct;
+    hashCholSol_  = new BHashCholSol;
+    hashCholFac_  = new BHashCholFac;
+  }
+  return(done_);
+}
+
 BHashCodeName& HashCodeName() 
-{ static BHashCodeName hashCodeName_; return(hashCodeName_); }
+{ InitialiceHashes();  return(*hashCodeName_); }
 BHashCSysName& HashCSysName() 
-{ static BHashCSysName hashCSysName_; return(hashCSysName_); }
+{ InitialiceHashes(); return(*hashCSysName_); }
 BHashCFacName& HashCFacName() 
-{ static BHashCFacName hashCFacName_; return(hashCFacName_); }
+{ InitialiceHashes(); return(*hashCFacName_); }
 BHashDefCode&  HashDefCode() 
-{ static BHashDefCode  hashDefCode_;  return(hashDefCode_ ); }
+{ InitialiceHashes(); return(*hashDefCode_ ); }
 BHashConvert&  HashConvert()  
-{ static BHashConvert  hashConvert_;  return(hashConvert_ ); }
+{ InitialiceHashes(); return(*hashConvert_ ); }
 BHashProduct&  HashProduct()
-{ static BHashProduct  hashProduct_;  return(hashProduct_ ); }
+{ InitialiceHashes(); return(*hashProduct_ ); }
 BHashCholSol&  HashCholSol()
-{ static BHashCholSol  hashCholSol_;  return(hashCholSol_ ); }
+{ InitialiceHashes(); return(*hashCholSol_ ); }
 BHashCholFac&  HashCholFac()
-{ static BHashCholFac  hashCholFac_;  return(hashCholFac_ ); }
+{ InitialiceHashes(); return(*hashCholFac_ ); }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -150 +177 @@
   if(!done_)
   {
+
     int i;
     done_ = true;
+
 /*
 #define CHOLMOD_OK            ( 0) // success