Skip to content

Handle not truncating root folder in CorUnix::InternalCanonicalizeRealPath for all architectures instead of only amd64 #110425

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
merged 1 commit into from
Dec 5, 2024
Merged

Handle not truncating root folder in CorUnix::InternalCanonicalizeRealPath for all architectures instead of only amd64 #110425

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
8 changes: 2 additions & 6 deletions src/coreclr/pal/src/file/file.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,6 @@ CorUnix::InternalCanonicalizeRealPath(LPCSTR lpUnixPath, PathCharString& lpBuffe
}
else
{
#if defined(HOST_AMD64)
bool fSetFilename = true;
// Since realpath implementation cannot handle inexistent filenames,
// check if we are going to truncate the "/" corresponding to the
Expand All @@ -358,8 +357,9 @@ CorUnix::InternalCanonicalizeRealPath(LPCSTR lpUnixPath, PathCharString& lpBuffe
fSetFilename = false;
}
else
#endif // defined(HOST_AMD64)
{
*pchSeparator = '\0';
}

if (!RealPathHelper(lpExistingPath, lpBuffer))
{
Expand All @@ -368,16 +368,12 @@ CorUnix::InternalCanonicalizeRealPath(LPCSTR lpUnixPath, PathCharString& lpBuffe
goto LExit;
}

#if defined(HOST_AMD64)
if (fSetFilename == true)
#endif // defined(HOST_AMD64)
lpFilename = pchSeparator + 1;
}

#if defined(HOST_AMD64)
if (lpFilename == NULL)
goto LExit;
#endif // HOST_AMD64

if (!lpBuffer.Append("/",1) || !lpBuffer.Append(lpFilename, strlen(lpFilename)))
{
Expand Down
Loading