Skip to content
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

[mono] Add support for backslash escaped colon in MONO_PATH #90526

Closed
wants to merge 4 commits into from
Closed

[mono] Add support for backslash escaped colon in MONO_PATH #90526

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c47f89e
Add support for backslash escaped colon
kotlarmilos Aug 14, 2023
900bad1
Fix lint
kotlarmilos Aug 14, 2023
f01288d
Add colon when concat strings
kotlarmilos Aug 14, 2023
3fa040b
Escape path on non-windows platforms
kotlarmilos Aug 14, 2023
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
14 changes: 14 additions & 0 deletions src/mono/mono/metadata/assembly.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,20 @@ mono_set_assemblies_path (const char* path)
assemblies_path = dest = split;
while (*split) {
char *tmp = *split;
#ifndef HOST_WIN32
int len = strlen(tmp);
// If the current string ends with a backslash, append the next string to it
while (len > 0 && tmp[len - 1] == '\\') {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Windows paths are expected to have backslashes, so this should probably only be executed when !Windows (or when G_SEARCHPATH_SEPARATOR_S == ':')

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it's necessarily a problem but the escaping mechanism seems rather inconsistent. This detects only backslash at the end of path that was followed by :. In Windows \: is never valid. In Linux it could be but then you can write it as \\: I guess.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, right, G_SEARCHPATH_SEPARATOR_S is going to be ; on Windows. That makes it a bit more messy.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the idea is to escape \\: on non-windows platforms which should allow correct path resolution. I parametrized the concat token and added #ifndef HOST_WIN32 macro. Do you see any other issues with the escaping mechanism?

tmp[len - 1] = '\0'; // Remove the backslash
if (*(split + 1)) {
tmp = g_strconcat (tmp, G_SEARCHPATH_SEPARATOR_S, *(split + 1), NULL);
g_free (*(split + 1)); // Free the next string since it's appended now
*(split + 1) = NULL; // Mark it as null
split++; // Skip the next string
}
len = strlen(tmp);
}
#endif
if (*tmp)
*dest++ = mono_path_canonicalize (tmp);
g_free (tmp);
Expand Down