Use SString type for path allocations in binder.

3 files changed, 18 insertions, 8 deletions

diff --git a/src/binder/cdebuglog.cpp b/src/binder/cdebuglog.cpp
index 717fbd2ef9..114a42ba33 100644
--- a/src/binder/cdebuglog.cpp
+++ b/src/binder/cdebuglog.cpp
@@ -56,7 +56,7 @@ namespace BINDER_SPACE
         {
             HRESULT hr=S_OK;
             LPTSTR  pszFileName;
-            TCHAR   szPath[MAX_LONGPATH];
+            PathString szPathString;
             DWORD   dw = 0;
 
             // _ASSERTE (pszPath ) ;
@@ -65,8 +65,12 @@ namespace BINDER_SPACE
                 IF_FAIL_GO(HRESULT_FROM_WIN32(ERROR_BUFFER_OVERFLOW));
             }
         
-            IF_FAIL_GO(StringCbCopy(szPath, sizeof(szPath), pszName));
-
+            size_t pszNameLen = wcslen(pszName);
+            WCHAR * szPath = szPathString.OpenUnicodeBuffer(static_cast<COUNT_T>(pszNameLen));
+            size_t cbSzPath = (sizeof(WCHAR)) * (pszNameLen + 1); // SString allocates extra byte for null
+            IF_FAIL_GO(StringCbCopy(szPath, cbSzPath, pszName));
+            szPathString.CloseBuffer(static_cast<COUNT_T>(pszNameLen));
+            
             pszFileName = PathFindFileName(szPath);
 
             if (pszFileName <= szPath)
diff --git a/src/binder/inc/bindertypes.hpp b/src/binder/inc/bindertypes.hpp
index 3c4bed4514..62c6fa61e0 100644
--- a/src/binder/inc/bindertypes.hpp
+++ b/src/binder/inc/bindertypes.hpp
@@ -32,7 +32,7 @@ class PEAssembly;
 
 namespace BINDER_SPACE
 {
-    typedef InlineSString<MAX_LONGPATH + 1> PathString;
+    typedef InlineSString<512> PathString;
 
     class AssemblyVersion;
     class AssemblyName;
diff --git a/src/binder/utils.cpp b/src/binder/utils.cpp
index 5befa8d629..a8e5cbc3e9 100644
--- a/src/binder/utils.cpp
+++ b/src/binder/utils.cpp
@@ -267,14 +267,17 @@ namespace BINDER_SPACE
 
         if (!path.IsEmpty())
         {
-            WCHAR wszCanonicalPath[MAX_LONGPATH];
+            PathString wszCanonicalPathString;
+            WCHAR * pwszCanonicalPath = wszCanonicalPathString.OpenUnicodeBuffer(MAX_LONGPATH);
             PlatformPath(path);
 
             // This is also defined in rotor pal
-            if (PathCanonicalizeW(wszCanonicalPath, path))
+            if (PathCanonicalizeW(pwszCanonicalPath, path))
             {
-                path.Set(wszCanonicalPath);
+                path.Set(pwszCanonicalPath);
             }
+            
+            wszCanonicalPathString.CloseBuffer();
 
             if (fAppendPathSeparator)
             {
@@ -300,7 +303,9 @@ namespace BINDER_SPACE
         BINDER_LOG_STRING(W("path A"), pathA);
         BINDER_LOG_STRING(W("path B"), pathB);
 
-        WCHAR tempResultPath[MAX_LONGPATH];
+        PathString tempResultPathString;
+        WCHAR * tempResultPath = tempResultPathString.OpenUnicodeBuffer(MAX_LONGPATH);
+
         if (PathCombineW(tempResultPath, pathA, pathB))
         {
             combinedPath.Set(tempResultPath);
@@ -311,6 +316,7 @@ namespace BINDER_SPACE
             combinedPath.Clear();
         }
         
+        tempResultPathString.CloseBuffer();
         BINDER_LOG_LEAVE(W("Utils::CombinePath"));
     }