Merge branch '3.0'

2 files changed, 3 insertions, 2 deletions

diff --git a/scripts/buildtests.sh b/scripts/buildtests.sh
index d812aaf4..7ec7aa03 100755
--- a/scripts/buildtests.sh
+++ b/scripts/buildtests.sh
@@ -547,7 +547,7 @@ then
     exit 1
   fi
   # read the min required CMake version from the top-level CMake file
-  minCMakeVers=`grep -i cmake_minimum_required $TOP/CMakeLists.txt | grep VERSION | sed 's/^.*VERSION\s*//i' | cut -d. -f1-2 | sed 's/\s*).*$//'`
+  minCMakeVers=`grep -i cmake_minimum_required $TOP/CMakeLists.txt | grep VERSION | sed 's/^.*VERSION\s*//' | cut -d. -f1-2 | sed 's/\s*).*$//'`
   # adjust PATH
   X=`echo $minCMakeVers | cut -d. -f1`
   Y=`echo $minCMakeVers | cut -d. -f2`
@@ -566,7 +566,7 @@ then
   if ( test `cmake --version | head -1 | grep -c $minCMakeVers` -ne 1 )
   then
     echo "Not using cmake version $minCMakeVers"
-    echo "Maybe you need to install it into /usr/local/opt/cmake-$minCMakeVers"
+    echo "Maybe you need to install it into /usr/local/opt/cmake-$minCMakeVers (or use the -m option)"
     exit 1
   fi
 fi
diff --git a/src/libicalss/icalcalendar.c b/src/libicalss/icalcalendar.c
index 35a35aa8..5d50f121 100644
--- a/src/libicalss/icalcalendar.c
+++ b/src/libicalss/icalcalendar.c
@@ -102,6 +102,7 @@ icalcalendar *icalcalendar_new(const char *dir)
     impl->incoming = 0;
 
     if (icalcalendar_create(impl) != ICAL_NO_ERROR) {
+        free(impl->dir);
         free(impl);
         return 0;
     }