fix -wpl crash and version 2.2.2.6

iqtree · May 27, 2023 · a4f9662 · a4f9662
1 parent ed050c3
commit a4f9662
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -82,7 +82,7 @@ endif()
 # The version number.
 set (iqtree_VERSION_MAJOR 2)
 set (iqtree_VERSION_MINOR 2)
-set (iqtree_VERSION_PATCH ".2.5")
+set (iqtree_VERSION_PATCH ".2.6")
 
 option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF)
 
@@ -576,7 +576,8 @@ set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS} -fno-inline-functions -fno-inlin
 set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS} -fno-inline-functions -fno-inline-functions-called-once -fno-optimize-sibling-calls -O2 -fno-omit-frame-pointer -g")
 
 if(CLANG AND IQTREE_FLAGS MATCHES "static")
-    set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread -Wl,--allow-multiple-definition")
+    #set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread -Wl,--allow-multiple-definition")
+    set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
 endif()
 
 if (IQTREE_FLAGS MATCHES "libcxx")

diff --git a/main/treetesting.cpp b/main/treetesting.cpp
@@ -134,7 +134,8 @@ void printPartitionLh(const char*filename, PhyloTree *tree, double *ptn_lh,
     } catch (ios::failure) {
         outError(ERR_WRITE_OUTPUT, filename);
     }    
-    delete[] pattern_lh;
+    if (!ptn_lh)
+        delete[] pattern_lh;
 }
 
 void printSiteLhCategory(const char*filename, PhyloTree *tree, SiteLoglType wsl) {