Skip to content

Fix SalGetFileAttributes and SalMoveFile to correctly handle paths #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mzagozda merged 1 commit into from
Feb 24, 2026
Merged

Fix SalGetFileAttributes and SalMoveFile to correctly handle paths #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/salamdr5.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1228,12 +1228,14 @@ BOOL SalMoveFile(const char* srcName, const char* destName)
// if name ends with space/dot, we must append '\\', otherwise MoveFile
// will trim spaces/dots and work with different name
char srcNameCopy[3 * MAX_PATH];
MakeCopyWithBackslashIfNeeded(srcName, srcNameCopy);
const char* srcNameToUse = srcName;
MakeCopyWithBackslashIfNeeded(srcNameToUse, srcNameCopy);
char destNameCopy[3 * MAX_PATH];
MakeCopyWithBackslashIfNeeded(destName, destNameCopy);
const char* destNameToUse = destName;
MakeCopyWithBackslashIfNeeded(destNameToUse, destNameCopy);

CStrP srcNameW(ConvertAllocUtf8ToWide(srcName, -1));
CStrP destNameW(ConvertAllocUtf8ToWide(destName, -1));
CStrP srcNameW(ConvertAllocUtf8ToWide(srcNameToUse, -1));
CStrP destNameW(ConvertAllocUtf8ToWide(destNameToUse, -1));
if (srcNameW == NULL || destNameW == NULL)
{
SetLastError(ERROR_NO_UNICODE_TRANSLATION);
Expand Down Expand Up @@ -1512,9 +1514,10 @@ DWORD SalGetFileAttributes(const char* fileName)
// but still better than getting attributes of different file/directory (for "c:\\file.txt "
// works with name "c:\\file.txt")
char fileNameCopy[3 * MAX_PATH];
MakeCopyWithBackslashIfNeeded(fileName, fileNameCopy);
const char* fileNameToUse = fileName;
MakeCopyWithBackslashIfNeeded(fileNameToUse, fileNameCopy);

CStrP fileNameW(ConvertAllocUtf8ToWide(fileName, -1));
CStrP fileNameW(ConvertAllocUtf8ToWide(fileNameToUse, -1));
if (fileNameW == NULL)
{
SetLastError(ERROR_NO_UNICODE_TRANSLATION);
Expand Down