SWIPE 2.0.12: Fix memory allocation error and memory leak

torognes · Dec 18, 2015 · fd5d3e0 · fd5d3e0
1 parent 47390cb
commit fd5d3e0
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 5 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,8 @@
+2014-06-27  Torbjorn Rognes  <[email protected]>
+	* Version 2.0.12
+	* Fixed a bug in memory allocation that caused segfaults.
+	* Fixed a minor memory leak.
+
 2014-06-27  Torbjorn Rognes  <[email protected]>
 	* Version 2.0.11
 	* Resolved a bug that resulted in SWIPE terminating with a fatal

diff --git a/Linux/mpiswipe b/Linux/mpiswipe
diff --git a/Linux/swipe b/Linux/swipe
diff --git a/Mac/mpiswipe b/Mac/mpiswipe
diff --git a/Mac/swipe b/Mac/swipe
diff --git a/matrices.cc b/matrices.cc
@@ -599,9 +599,9 @@ void score_matrix_init()
 void score_matrix_free()
 {
   free(score_matrix_7);
-  score_matrix_7t = NULL;
-  free(score_matrix_7t);
   score_matrix_7 = NULL;
+  free(score_matrix_7t);
+  score_matrix_7t = NULL;
   free(score_matrix_8);
   score_matrix_8 = NULL;
   free(score_matrix_16);

diff --git a/swipe.cc b/swipe.cc
@@ -172,7 +172,7 @@ void fatal(const char * format, const char * message)
 void * xmalloc(size_t size)
 {
   const size_t alignment = 16;
-  void * t;
+  void * t = NULL;
   posix_memalign(& t, alignment, size);
 
   if (t==NULL)
@@ -560,7 +560,6 @@ void align_threads_init()
   }
 
   long totalchunks;
-  long maxchunksize;
 
   calc_chunks(bins,
 	      threads,

diff --git a/swipe.h b/swipe.h
@@ -55,7 +55,7 @@
 #define LINE_MAX 2048
 #endif
 
-#define SWIPE_VERSION "2.0.11"
+#define SWIPE_VERSION "2.0.12"
 
 // Should be 32bits integer
 typedef unsigned int UINT32;