[WIN32] fixed: stack overflow in libpcre (ticket #10237)

(cherry picked from commit e2b89e52fd39448c20bfaf69334a2ba5ad2f9f4e)

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@34316 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

3 files changed, 7 insertions, 7 deletions

diff --git a/lib/pcre/libpcre/libpcre.vcproj b/lib/pcre/libpcre/libpcre.vcproj
index 8406b9f425..00def6e851 100644
--- a/lib/pcre/libpcre/libpcre.vcproj
+++ b/lib/pcre/libpcre/libpcre.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9,00"

+	Version="9.00"

 	Name="libpcre"

 	ProjectGUID="{D8097C41-605D-4917-8957-9DF7F44A18CD}"

 	RootNamespace="libpcre"

@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories=".;..\"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

+				PreprocessorDefinitions="NO_RECURSE;WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -110,7 +110,7 @@
 				EnableIntrinsicFunctions="true"

 				WholeProgramOptimization="false"

 				AdditionalIncludeDirectories=".;..\"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

+				PreprocessorDefinitions="NO_RECURSE;WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				UsePrecompiledHeader="0"

diff --git a/lib/pcre/libpcre/libpcre.vcxproj b/lib/pcre/libpcre/libpcre.vcxproj
index 9aa61f0e18..48e0ad3bed 100644
--- a/lib/pcre/libpcre/libpcre.vcxproj
+++ b/lib/pcre/libpcre/libpcre.vcxproj
@@ -48,7 +48,7 @@
     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>.;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>NO_RECURSE;WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

@@ -69,7 +69,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>

       <WholeProgramOptimization>false</WholeProgramOptimization>

       <AdditionalIncludeDirectories>.;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>NO_RECURSE;WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>

diff --git a/lib/pcre/pcre_exec.c b/lib/pcre/pcre_exec.c
index fb27e17bc0..ebf369b993 100644
--- a/lib/pcre/pcre_exec.c
+++ b/lib/pcre/pcre_exec.c
@@ -283,7 +283,7 @@ argument of match(), which never changes. */
 
 #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw)\
   {\
-  heapframe *newframe = (pcre_stack_malloc)(sizeof(heapframe));\
+  heapframe *newframe = (heapframe*)(pcre_stack_malloc)(sizeof(heapframe));\
   frame->Xwhere = rw; \
   newframe->Xeptr = ra;\
   newframe->Xecode = rb;\
@@ -472,7 +472,7 @@ heap storage. Set up the top-level frame here; others are obtained from the
 heap whenever RMATCH() does a "recursion". See the macro definitions above. */
 
 #ifdef NO_RECURSE
-heapframe *frame = (pcre_stack_malloc)(sizeof(heapframe));
+heapframe *frame = (heapframe*)(pcre_stack_malloc)(sizeof(heapframe));
 frame->Xprevframe = NULL;            /* Marks the top level */
 
 /* Copy in the original argument variables */