6 files changed, 6 insertions, 6 deletions
diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/CMakeLists.txt
index a0c1dff62a..9149221008 100644
--- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetCurrentDirectoryW.c
+  SetCurrentDirectoryW.cpp
 )
 
 add_executable(paltest_setcurrentdirectoryw_test1
diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/SetCurrentDirectoryW.c b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/SetCurrentDirectoryW.cpp
index 257d016ffb..e10f2ea8a1 100644
--- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/SetCurrentDirectoryW.c
+++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/SetCurrentDirectoryW.cpp
@@ -52,7 +52,7 @@ BOOL GetCurrentDir(WCHAR* szwCurrentDir)
     // now strip the file name from the full path to get the current path
     nCount = lstrlenW(szwReturnedPath) - lstrlenW(szwFileName);
     memset(szwCurrentDir, 0, sizeof(WCHAR)*(_MAX_DIR+1));
-    lstrcpynW(szwCurrentDir, szwReturnedPath, nCount);
+    wcsncpy(szwCurrentDir, szwReturnedPath, nCount - 1);
 
     free(szwFileName);
     return(TRUE);
diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/CMakeLists.txt
index a032462d19..455ddc828d 100644
--- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  setcurrentdirectoryw.c
+  setcurrentdirectoryw.cpp
 )
 
 add_executable(paltest_setcurrentdirectoryw_test2
diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/setcurrentdirectoryw.c b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/setcurrentdirectoryw.cpp
index 7e3d7b785f..7f833baabc 100644
--- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/setcurrentdirectoryw.c
+++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/setcurrentdirectoryw.cpp
@@ -63,9 +63,9 @@ int __cdecl main(int argc, char *argv[])
      /* append the temp name to the "home" directory */
     memset(szBuiltDir, 0, MAX_PATH);
 #if WIN32
-    sprintf(szBuiltDir,"%s\\..\\", szDirName);
+    sprintf_s(szBuiltDir, _countof(szBuiltDir),"%s\\..\\", szDirName);
 #else
-    sprintf(szBuiltDir,"%s/../", szDirName);
+    sprintf_s(szBuiltDir, _countof(szBuiltDir),"%s/../", szDirName);
 #endif
 
     szwBuiltDir = convert(szBuiltDir);
diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/CMakeLists.txt
index 3b981f9564..1cb1150a61 100644
--- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  setcurrentdirectoryw.c
+  setcurrentdirectoryw.cpp
 )
 
 add_executable(paltest_setcurrentdirectoryw_test3
diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/setcurrentdirectoryw.c b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/setcurrentdirectoryw.cpp
index e8c4be2ad4..e8c4be2ad4 100644
--- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/setcurrentdirectoryw.c
+++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/setcurrentdirectoryw.cpp