Index: Source/kwsys/SystemTools.cxx
===================================================================
--- Source/kwsys/SystemTools.cxx	(revision 661369)
+++ Source/kwsys/SystemTools.cxx	(revision 661370)
@@ -4485,36 +4485,43 @@
 bool SystemTools::GetShortPath(const std::string& path, std::string& shortPath)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
-  const int size = int(path.size()) +1; // size of return
-  char *tempPath = new char[size];  // create a buffer
-  DWORD ret;
+  std::string tempPath = path;  // create a buffer
 
   // if the path passed in has quotes around it, first remove the quotes
   if (!path.empty() && path[0] == '"' && *path.rbegin() == '"')
     {
-    strcpy(tempPath,path.c_str()+1);
-    tempPath[size-2] = '\0';
+    tempPath = path.substr(1, path.length()-2);
     }
-  else
-    {
-    strcpy(tempPath,path.c_str());
-    }
 
   std::wstring wtempPath = Encoding::ToWide(tempPath);
-  std::vector<wchar_t> buffer(wtempPath.size()+1);
-  buffer[0] = 0;
-  ret = GetShortPathNameW(wtempPath.c_str(),
-    &buffer[0], static_cast<DWORD>(wtempPath.size()));
 
-  if(buffer[0] == 0 || ret > wtempPath.size())
+  DWORD ret = wtempPath.size() < MAX_PATH ? MAX_PATH : wtempPath.size();
+  std::vector<wchar_t> buffer;
+  do
     {
-    delete [] tempPath;
+    buffer.resize(ret + 1);
+    buffer[0] = 0;
+
+    ret = GetShortPathNameW(wtempPath.c_str(),
+      &buffer[0], static_cast<DWORD>(buffer.size()));
+    if(ret == 0)
+      {
+	  return false;
+      }
+    if(ret == buffer.size())
+      {
+	  buffer.resize( ret + MAX_PATH + 1 );
+	  }
+    }
+  while(ret == buffer.size());
+
+  if(buffer[0] == 0)
+    {
     return false;
     }
   else
     {
     shortPath = Encoding::ToNarrow(&buffer[0]);
-    delete [] tempPath;
     return true;
     }
 #else
Index: Tests/CMakeLib/testSystemTools.cxx
===================================================================
--- Tests/CMakeLib/testSystemTools.cxx	(revision 661369)
+++ Tests/CMakeLib/testSystemTools.cxx	(revision 661370)
@@ -29,5 +29,23 @@
     {
     cmFailed("cmSystemTools::UpperCase is working");
     }
+
+  std::string res;
+  if(cmSystemTools::GetShortPath( "\"C:\\Program Files\\7-Zip\\7z.exe\"", res ))
+    {
+    cmPassed("cmSystemTools::GetShortPath is working");
+    }
+  else
+    {
+    cmFailed("cmSystemTools::GetShortPath is working");
+    }
+  if(res == "C:\\PROGRA~1\\7-Zip\\7z.exe")
+    {
+    cmPassed("cmSystemTools::GetShortPath works great");
+    }
+  else
+    {
+    cmFailed("cmSystemTools::GetShortPath works great");
+    }
   return failed;
 }