Solved leaky pointers and variable scope problems (Thanks to Ulf Lorenz)

juanjosegarciaripoll · Dec 7, 2017 · 93bb36b · 93bb36b
1 parent e963190
commit 93bb36b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/src/linalg/find_blocks.hpp b/src/linalg/find_blocks.hpp
@@ -111,6 +111,8 @@ namespace linalg {
     if (nblocks == 1) {
       block_rows = 0;
       block_cols = 0;
+      delete[] row_block;
+      delete[] col_block;
       return false;
     }
 

diff --git a/src/rand/rand64.cc b/src/rand/rand64.cc
@@ -108,7 +108,6 @@ void init_by_array(uint64_t init_key[], int key_length)
 /* generates a random number on [0, 2^64-1]-interval */
 uint64_t genrand_int64(void)
 {
-  int i;
   uint64_t x;
   static uint64_t mag01[2]={0ULL, MATRIX_A};
 
@@ -119,6 +118,7 @@ uint64_t genrand_int64(void)
     if (mti == NN+1) 
       init_genrand(5489ULL); 
 
+    int i;
     for (i=0;i<NN-MM;i++) {
       x = (mt[i]&UM)|(mt[i+1]&LM);
       mt[i] = mt[i+MM] ^ (x>>1) ^ mag01[(int)(x&1ULL)];

diff --git a/src/sdf/data_file.cc b/src/sdf/data_file.cc
@@ -44,10 +44,9 @@ static int get_lock(char const *lockName, bool wait)
 #if defined(_MSC_VER) || defined(__MINGW32__)
   return 1;
 #else
-    int fd;
     do {
       mode_t m = umask(0);
-      fd = open(lockName, O_RDWR|O_CREAT, 0666);
+      int fd = open(lockName, O_RDWR|O_CREAT, 0666);
       umask(m);
       if( fd >= 0 && flock( fd, LOCK_EX | LOCK_NB ) < 0 )
 	{

diff --git a/src/sdf/idata_file.cc b/src/sdf/idata_file.cc
@@ -147,7 +147,7 @@ InDataFile::read_variable_name()
   char *buffer = new char[var_name_size];
   read_raw(buffer, var_name_size);
   std::string output(buffer);
-  delete buffer;
+  delete[] buffer;
   return output;
 }
 

diff --git a/src/sdf/odata_file.cc b/src/sdf/odata_file.cc
@@ -165,7 +165,7 @@ OutDataFile::write_variable_name(const std::string &name)
   memset(buffer, 0, var_name_size);
   strncpy(buffer, name.c_str(), std::min<size_t>(var_name_size - 1, name.size()));
   write_raw(buffer, var_name_size);
-  delete buffer;
+  delete[] buffer;
 }
 
 void

diff --git a/src/tools/jobs.cc b/src/tools/jobs.cc
@@ -104,7 +104,6 @@ Job::parse_file(std::istream &s, var_list &data)
 Job::Job(int argc, const char **argv) :
   filename_("no file")
 {
-  bool loaded = false;
   bool print_jobs = false;
   bool first_job_found = false;
   bool last_job_found = false;
@@ -127,7 +126,6 @@ Job::Job(int argc, const char **argv) :
 		  << std::endl;
 	abort();
       }
-      loaded = true;
     } else if (!strcmp(argv[i], "--print-jobs")) { 
       print_jobs = true;
     } else if (!strcmp(argv[i], "--this-job")) {
@@ -178,7 +176,6 @@ Job::Job(int argc, const char **argv) :
 	abort();
       }
       variables_.push_back(v);
-      loaded = true;
     } else if (!strcmp(argv[i], "--help")) {
       std::cout << "Arguments:\n"
 	"--help\n"