Skip to content

Fix duplicate Uri ToString for DOS-like custom schemes #121930

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 3 commits into from
Nov 25, 2025
Merged

Fix duplicate Uri ToString for DOS-like custom schemes #121930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e37fbe8
Fix duplicate Uri ToString for DOS-like custom schemes
MihaZupan Nov 24, 2025
42d5d83
Tweak asserts
MihaZupan Nov 24, 2025
b96de33
More tests
MihaZupan Nov 24, 2025
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
39 changes: 25 additions & 14 deletions src/libraries/System.Private.Uri/src/System/Uri.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2277,12 +2277,21 @@ private void CreateUriInfo(Flags cF)

if ((cF & Flags.AuthorityFound) != 0)
{
Debug.Assert(str[idx] is '/' or '\\' && str[idx + 1] is '/' or '\\');

if (str[idx] == '\\' || str[idx + 1] == '\\')
notCanonicalScheme = true;
if (str[idx] is '/' or '\\' && str[idx + 1] is '/' or '\\')
{
if (str[idx] == '\\' || str[idx + 1] == '\\')
{
notCanonicalScheme = true;
}

idx += 2;
idx += 2;
}
else
{
Debug.Assert(IsDosPath);
Debug.Assert(char.IsAsciiLetter(str.AsSpan(idx).TrimStart(['/', '\\'])[0]));
Debug.Assert(str.AsSpan(idx).TrimStart(['/', '\\'])[1] is ':' or '|');
}

if ((cF & (Flags.UncPath | Flags.DosPath)) != 0)
{
Expand Down Expand Up @@ -3249,21 +3258,23 @@ private void ParseRemaining()
DebugAssertInCtor();

// Dos/Unix paths have no host. Other schemes cleared/set _string with host information in PrivateParseMinimal.
if (IsFile && !IsUncPath)
if (InFact(Flags.DosPath | Flags.UnixPath))
{
if (IsImplicitFile)
{
_string = string.Empty;
}
else
{
_string = _syntax.SchemeName + SchemeDelimiter;
}
Debug.Assert(!InFact(Flags.HasUserInfo));

_string =
IsImplicitFile ? string.Empty :
InFact(Flags.AuthorityFound) ? _syntax.SchemeName + SchemeDelimiter :
_syntax.SchemeName + ':';

_info.Offset.Scheme = 0;
_info.Offset.User = _string.Length;
_info.Offset.Host = _string.Length;
}
else
{
Debug.Assert(!ReferenceEquals(_string, OriginalString));
}

_info.Offset.Path = _string.Length;
idx = _info.Offset.Path;
Expand Down
21 changes: 21 additions & 0 deletions src/libraries/System.Private.Uri/tests/FunctionalTests/UriTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,12 +821,33 @@ public static IEnumerable<object[]> FilePathHandlesNonAscii_TestData()
yield return new object[] { "file:///\u00FCri/", "file:///\u00FCri/", "/%C3%BCri/", "file:///%C3%BCri/", "/\u00FCri/" };
yield return new object[] { "file:///a/b\uD83D\uDE1F/Foo.cs", "file:///a/b\uD83D\uDE1F/Foo.cs", "/a/b%F0%9F%98%9F/Foo.cs", "file:///a/b%F0%9F%98%9F/Foo.cs", "/a/b\uD83D\uDE1F/Foo.cs" };

// DOS with ':' or ':/' instead of '://'
yield return new object[] { "file:C:/uri/", "file:///C:/uri/", "C:/uri/", "file:///C:/uri/", "C:\\uri\\" };
yield return new object[] { "file:C:/\u00FCri/", "file:///C:/\u00FCri/", "C:/%C3%BCri/", "file:///C:/%C3%BCri/", "C:\\\u00FCri\\" };
yield return new object[] { "file:/C:/uri/", "file:///C:/uri/", "C:/uri/", "file:///C:/uri/", "C:\\uri\\" };
yield return new object[] { "file:/C:/\u00FCri/", "file:///C:/\u00FCri/", "C:/%C3%BCri/", "file:///C:/%C3%BCri/", "C:\\\u00FCri\\" };

// DOS
yield return new object[] { "file://C:/uri/", "file:///C:/uri/", "C:/uri/", "file:///C:/uri/", "C:\\uri\\" };
yield return new object[] { "file://C:/\u00FCri/", "file:///C:/\u00FCri/", "C:/%C3%BCri/", "file:///C:/%C3%BCri/", "C:\\\u00FCri\\" };
yield return new object[] { "file:///C:/uri/", "file:///C:/uri/", "C:/uri/", "file:///C:/uri/", "C:\\uri\\" };
yield return new object[] { "file:///C:/\u00FCri/", "file:///C:/\u00FCri/", "C:/%C3%BCri/", "file:///C:/%C3%BCri/", "C:\\\u00FCri\\" };
yield return new object[] { "C:/\u00FCri/", "file:///C:/\u00FCri/", "C:/%C3%BCri/", "file:///C:/%C3%BCri/", "C:\\\u00FCri\\" };
yield return new object[] { "\tC:/\u00FCri/", "file:///C:/\u00FCri/", "C:/%C3%BCri/", "file:///C:/%C3%BCri/", "C:\\\u00FCri\\" };

// DOS in custom scheme (differs in whether ':' vs '://' is used since it doesn't have MustHaveAuthority)
yield return new object[] { "custom:C:/uri/", "custom:C:/uri/", "C:/uri/", "custom:C:/uri/", "C:\\uri\\" };
yield return new object[] { "custom:C:/\u00FCri/", "custom:C:/\u00FCri/", "C:/%C3%BCri/", "custom:C:/%C3%BCri/", "C:\\\u00FCri\\" };
yield return new object[] { "custom:/C:/uri/", "custom:/C:/uri/", "C:/uri/", "custom:/C:/uri/", "C:\\uri\\" };
yield return new object[] { "custom:/C:/\u00FCri/", "custom:/C:/\u00FCri/", "C:/%C3%BCri/", "custom:/C:/%C3%BCri/", "C:\\\u00FCri\\" };
yield return new object[] { "custom://C:/uri/", "custom:///C:/uri/", "C:/uri/", "custom:///C:/uri/", "C:\\uri\\" };
yield return new object[] { "custom://C:/\u00FCri/", "custom:///C:/\u00FCri/", "C:/%C3%BCri/", "custom:///C:/%C3%BCri/", "C:\\\u00FCri\\" };
yield return new object[] { "custom:///C:/uri/", "custom:///C:/uri/", "C:/uri/", "custom:///C:/uri/", "C:\\uri\\" };
yield return new object[] { "custom:///C:/\u00FCri/", "custom:///C:/\u00FCri/", "C:/%C3%BCri/", "custom:///C:/%C3%BCri/", "C:\\\u00FCri\\" };

yield return new object[] { "vsmacros://C:/\u00FCri/", "vsmacros://C:/\u00FCri/", "C:/%C3%BCri/", "vsmacros://C:/%C3%BCri/", "C:\\\u00FCri\\" };
yield return new object[] { "vsmacros://test/\u00FCri/", "vsmacros://test/\u00FCri/", "/%C3%BCri/", "vsmacros://test/%C3%BCri/", "\\\\test\\\u00FCri\\" };

// UNC
yield return new object[] { "\\\\\u00FCri/", "file://\u00FCri/", "/", "file://\u00FCri/", "\\\\\u00FCri\\" };
yield return new object[] { "file://\u00FCri/", "file://\u00FCri/", "/", "file://\u00FCri/", "\\\\\u00FCri\\" };
Expand Down
Loading