[playmidi] Fix buffer overflow when more than 32 voices get selected

[timidity41/timidity41.git] / WriteVersion.cmake

diff --git a/WriteVersion.cmake b/WriteVersion.cmake
index 9fd08e5..5b15a4d 100644 (file)
--- a/WriteVersion.cmake
+++ b/WriteVersion.cmake
@@ -1,11 +1,18 @@
 
 execute_process(
-    COMMAND "${GIT_EXECUTABLE}" describe
+    COMMAND "${GIT_EXECUTABLE}" describe --first-parent
     OUTPUT_VARIABLE gitDescribeResult
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
 string(REPLACE "tim" "" tim41VersionStr "${gitDescribeResult}")
-string(REGEX MATCH "[0-9.]+\\.[0-9.]+\\.[0-9.]+" tim41Version3 "${gitDescribeResult}")
-string(REPLACE "." "," tim41Version3Comma "${tim41Version3}")
+
+if("${gitDescribeResult}" MATCHES "[0-9.]+\\.[0-9.]+\\.[0-9.]+-[0-9]+")
+    string(REGEX MATCH "[0-9.]+\\.[0-9.]+\\.[0-9.]+-[0-9]+" tim41Version4 "${gitDescribeResult}")
+else()
+    string(REGEX MATCH "[0-9.]+\\.[0-9.]+\\.[0-9.]+" tim41Version4 "${gitDescribeResult}")
+    string(APPEND tim41Version4 ".0")
+endif()
+
+string(REGEX REPLACE "[\\.\\-]" "," tim41Version4Comma "${tim41Version4}")
 configure_file(${INFILE} ${OUTFILE})