Skip to content

Commit 34eb0c9

Browse files
committed
Merge branch 'fix-url-parse'
2 parents a10a5fb + 5366fa7 commit 34eb0c9

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

Cargo.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deny.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ allow = [
3131
"ISC",
3232
"Unicode-DFS-2016",
3333
"LicenseRef-ring",
34-
"Zlib"
34+
"Zlib",
35+
"Unicode-3.0"
3536
]
3637
# The confidence threshold for detecting a license from license text.
3738
# The higher the value, the more closely the license text must be to the

gix-url/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ serde = ["dep:serde", "bstr/serde"]
2020
gix-features = { version = "^0.38.1", path = "../gix-features" }
2121
gix-path = { version = "^0.10.7", path = "../gix-path" }
2222

23-
serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"]}
23+
serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"] }
2424
thiserror = "1.0.32"
25-
url = "2.5.0"
25+
url = "2.5.1"
2626
bstr = { version = "1.3.0", default-features = false, features = ["std"] }
2727
home = "0.5.5"
2828

gix-url/src/parse.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ pub(crate) fn file_url(input: &BStr, protocol_colon: usize) -> Result<crate::Url
183183
// We cannot use the url crate to parse host and path because it special cases Windows
184184
// driver letters. With the url crate an input of `file://x:/path/to/git` is parsed as empty
185185
// host and with `x:/path/to/git` as path. This behavior is wrong for Git which only follows
186-
// that rule on Windows and parses `x:` as host on Unix platforms. Additionally the url crate
186+
// that rule on Windows and parses `x:` as host on Unix platforms. Additionally, the url crate
187187
// does not account for Windows special UNC path support.
188188

189189
// TODO: implement UNC path special case
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ws://xn--55555577

gix-url/tests/fuzzed.rs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use bstr::ByteSlice;
55
#[test]
66
fn fuzzed() {
77
for name in [
8+
"short-panic",
89
"very-long-abort2",
910
"very-long-abort",
1011
"very-long6",

0 commit comments

Comments
 (0)