From 42aa0540891bc9a90b7bb4e5f6009ee8d7c3be79 Mon Sep 17 00:00:00 2001
From: Greg Wroblewski <gwroblew@hotmail.com>
Date: Tue, 13 Nov 2012 11:44:38 -0800
Subject: [PATCH] remotestrunk

---
 iis/ModSecurityIIS.sln     | 4 ++--
 iis/ModSecurityIIS.vcxproj | 4 ++--
 iis/mymodule.cpp           | 5 +++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/iis/ModSecurityIIS.sln b/iis/ModSecurityIIS.sln
index 0a45f76b..1b272dd1 100644
--- a/iis/ModSecurityIIS.sln
+++ b/iis/ModSecurityIIS.sln
@@ -15,8 +15,8 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D1F7201F-064B-48AB-868C-FED22464841C}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
-		{D1F7201F-064B-48AB-868C-FED22464841C}.Debug|Mixed Platforms.Build.0 = Debug|x64
+		{D1F7201F-064B-48AB-868C-FED22464841C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{D1F7201F-064B-48AB-868C-FED22464841C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{D1F7201F-064B-48AB-868C-FED22464841C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D1F7201F-064B-48AB-868C-FED22464841C}.Debug|Win32.Build.0 = Debug|Win32
 		{D1F7201F-064B-48AB-868C-FED22464841C}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/iis/ModSecurityIIS.vcxproj b/iis/ModSecurityIIS.vcxproj
index beb52e1f..8570be80 100644
--- a/iis/ModSecurityIIS.vcxproj
+++ b/iis/ModSecurityIIS.vcxproj
@@ -79,7 +79,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>C:\work\pcre-8.30\include;C:\work\pcre-8.30;C:\work\libxml2-2.7.7\include;C:\apache22\include;..\apache2;..\standalone</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\work\pcre-8.30\include;C:\work\pcre-8.30;C:\work\libxml2-2.7.7\include;C:\work\apache24\include;..\apache2;..\standalone</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC;VERSION_IIS</PreprocessorDefinitions>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
@@ -89,7 +89,7 @@
     <Link>
       <ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);C:\apache22\lib\libapr-1.lib;C:\apache22\lib\libaprutil-1.lib;C:\work\pcre-8.30\pcre.lib;C:\work\libxml2-2.7.7\win32\bin.msvc\libxml2.lib</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);C:\work\apache24\lib\libapr-1.lib;C:\work\apache24\lib\libaprutil-1.lib;C:\work\pcre-8.30\pcre.lib;C:\work\libxml2-2.7.7\win32\bin.msvc\libxml2.lib</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>copy /y $(TargetPath) c:\drop\$(PlatformShortName)
diff --git a/iis/mymodule.cpp b/iis/mymodule.cpp
index b02e6f60..164a26be 100644
--- a/iis/mymodule.cpp
+++ b/iis/mymodule.cpp
@@ -87,6 +87,11 @@ char *GetIpAddr(apr_pool_t *pool, PSOCKADDR pAddr)
 	DWORD len = 50;
 	char *buf = (char *)apr_palloc(pool, len);
 
+	if(buf == NULL)
+		return "";
+
+	buf[0] = 0;
+
 	WSAAddressToString(pAddr, sizeof(SOCKADDR), NULL, buf, &len);
 
 	return buf;