summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClinton Stimpson <clinton@elemtech.com>2008-06-02 19:44:02 -0400
committerClinton Stimpson <clinton@elemtech.com>2008-06-02 19:44:02 -0400
commit0d845b8da8f13f568d560ed575b6341f6512bc1f (patch)
treed5b08ff5603b3fb6b71b5784c3a79747610cc332
parentbed3ac8741405132096430c9f61578df9f8cfbf9 (diff)
downloadcmake-0d845b8da8f13f568d560ed575b6341f6512bc1f.tar.gz
BUG: FormatMessage can return a NULL message. Add check for NULL pointer.
-rw-r--r--Source/kwsys/DynamicLoader.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/kwsys/DynamicLoader.cxx b/Source/kwsys/DynamicLoader.cxx
index 0c73d7af19..1fdcaf0115 100644
--- a/Source/kwsys/DynamicLoader.cxx
+++ b/Source/kwsys/DynamicLoader.cxx
@@ -305,7 +305,7 @@ const char* DynamicLoader::LibExtension()
//----------------------------------------------------------------------------
const char* DynamicLoader::LastError()
{
- LPVOID lpMsgBuf;
+ LPVOID lpMsgBuf=NULL;
FormatMessage(
FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
@@ -317,6 +317,11 @@ const char* DynamicLoader::LastError()
NULL
);
+ if(!lpMsgBuf)
+ {
+ return NULL;
+ }
+
static char* str = 0;
delete [] str;
str = strcpy(new char[strlen((char*)lpMsgBuf)+1], (char*)lpMsgBuf);