Merge branch 'master' into release

Author: andywolk

CMakeLists.txt

@@ -43,7 +43,7 @@ if (KS_PLAT_WIN OR WITH_KS_TEST)
 endif()
 
 # Declare our project, libks2
-project(LibKS2 VERSION 2.0.8 LANGUAGES C CXX)
+project(LibKS2 VERSION 2.0.9 LANGUAGES C CXX)
 message("LibKS2 Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
 
 # Set package version

src/include/libks/ks.h

@@ -30,10 +30,10 @@
 #endif
 
 /* libks version as a string */
-#define KS_VERSION "2.0.8"
+#define KS_VERSION "2.0.9"
 
 /* libks version as a number */
-#define KS_VERSION_NUM 20008
+#define KS_VERSION_NUM 20009
 
 /* Use this to allow enabling TCP_KEEPIDLE and TCP_KEEPINTVL socket options */
 //#define KS_KEEP_IDLE_INTVL 1

src/ks_debug.c

@@ -35,7 +35,7 @@ static int __full_callback(void *data __attribute__((unused)), uintptr_t pc, con
 		function == NULL ? "???" : function ,
 		function == NULL ? "???" : filename, lineno);
 
-	return strcmp(function, "main") == 0 ? 1 : 0;
+	return (function != NULL && strcmp(function, "main") == 0) ? 1 : 0;
 }
 
 static void __error_callback(void *data, const char *msg, int errnum)

src/kws.c

@@ -985,6 +985,7 @@ KS_DECLARE(ks_status_t) kws_init_ex(kws_t **kwsP, ks_socket_t sock, SSL_CTX *ssl
 
  err:
 	kws_destroy(&kws);
+	*kwsP = NULL;
 
 	return KS_STATUS_FAIL;
 }

win/libks-version.props

@@ -4,7 +4,7 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <libksVersion>2.0.8</libksVersion>
+    <libksVersion>2.0.9</libksVersion>
     <libksBuildNumber>0</libksBuildNumber>
     <libksLibDir>$(BaseDir)../</libksLibDir>
   </PropertyGroup>