History

Merge branch 'fix-url-parse'

Sebastian Thiel committed 2 years ago

Commit 34eb0c92 parents a10a5fb 5366fa76 files · +11 −8Browse files

Unified · Split

6 files
  1. Cargo.lock +4 −4
  2. deny.toml +2 −1
  3. gix-url/Cargo.toml +2 −2
  4. gix-url/src/parse.rs +1 −1
  5. gix-url/tests/fixtures/fuzzed/short-panic.url +1 −0
  6. gix-url/tests/fuzzed.rs +1 −0
Cargo.lock+4−4
@@ -4934,9 +4934,9 @@ dependencies = [ · 4933 unmodified lines
49344934
49354935 [[package]]
49364936 name = "unicode-bidi"
4937−version = "0.3.14"
4937+version = "0.3.15"
49384938 source = "registry+https://github.com/rust-lang/crates.io-index"
4939−checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416"
4939+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
49404940
49414941 [[package]]
49424942 name = "unicode-bom"
@@ -4985,9 +4985,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" · 42 unmodified lines
49854985
49864986 [[package]]
49874987 name = "url"
4988−version = "2.5.0"
4988+version = "2.5.2"
49894989 source = "registry+https://github.com/rust-lang/crates.io-index"
4990−checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
4990+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
49914991 dependencies = [
49924992 "form_urlencoded",
49934993 "idna",
deny.toml+2−1
@@ -31,7 +31,8 @@ allow = [ · 30 unmodified lines
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
@@ -20,9 +20,9 @@ serde = ["dep:serde", "bstr/serde"] · 19 unmodified lines
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
@@ -183,7 +183,7 @@ pub(crate) fn file_url(input: &BStr, protocol_colon: usize) -> Result<crate::Url · 182 unmodified lines
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
gix-url/tests/fixtures/fuzzed/short-panic.url+1−0
@@ -0,0 +1 @@
1+ws://xn--55555577
gix-url/tests/fuzzed.rs+1−0
@@ -5,6 +5,7 @@ use bstr::ByteSlice; · 4 unmodified lines
55 #[test]
66 fn fuzzed() {
77 for name in [
8+ "short-panic",
89 "very-long-abort2",
910 "very-long-abort",
1011 "very-long6",