Skip to content

Commit cc9420f

Browse files
authored
Rollup merge of #139605 - oyvindln:update_miniz_oxide_0_8, r=Mark-Simulacrum
update ```miniz_oxide``` to 0.8.8 I would normally let the auto actions handle this but it turns out 0.8.7 can trigger a panic when debug assertions are enabled in a few cases so I feel it's important it gets sorted more quickly. (and I would ideally like to yank that version but was worried that could cause some issues had been pulled in as a dependency by this repo already before I discovered the problem) As it can only happen when debug assertions are enabled (the overflow results in the intended result so it doesn't cause any issue in release mode) and using the wrapping buffer mode when decompressing it is very unlikely to cause any issues here but I would like to get it sorted just to be safe. ```miniz_oxide``` is used in the standard library (and some tools) via ```backtrace-rs ``` which doesn't use a wrapping buffer, and thus won't trigger this condition. There does however seem like there are some tools that do dependency on ```flate2``` which does use ```miniz_oxide``` decompression using a a wrapping buffer and could in theory trigger it if they are run when compiled with debug assertions enabled. It's kinda unclear what version what tool uses though as several of them specify older versions of flate2 which depended on ```miniz_oxide``` 0.7.x in cargo.toml, and ```miniz_oxide```, and not all have a cargo.lock and due to an older version of ```backtrace``` being in the root Cargo.lock which still depended on ```miniz_oxide``` 0.7.4, so that version is also pulled in alongside the newer version.
2 parents bde65bd + 7711688 commit cc9420f

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

Diff for: Cargo.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -1212,7 +1212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
12121212
checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
12131213
dependencies = [
12141214
"crc32fast",
1215-
"miniz_oxide 0.8.7",
1215+
"miniz_oxide 0.8.8",
12161216
]
12171217

12181218
[[package]]
@@ -2282,9 +2282,9 @@ dependencies = [
22822282

22832283
[[package]]
22842284
name = "miniz_oxide"
2285-
version = "0.8.7"
2285+
version = "0.8.8"
22862286
source = "registry+https://github.com/rust-lang/crates.io-index"
2287-
checksum = "ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430"
2287+
checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
22882288
dependencies = [
22892289
"adler2",
22902290
]

Diff for: library/Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@ dependencies = [
176176

177177
[[package]]
178178
name = "miniz_oxide"
179-
version = "0.8.7"
179+
version = "0.8.8"
180180
source = "registry+https://github.com/rust-lang/crates.io-index"
181-
checksum = "ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430"
181+
checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
182182
dependencies = [
183183
"adler2",
184184
"compiler_builtins",

Diff for: src/ci/citool/Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -563,9 +563,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
563563

564564
[[package]]
565565
name = "miniz_oxide"
566-
version = "0.8.5"
566+
version = "0.8.8"
567567
source = "registry+https://github.com/rust-lang/crates.io-index"
568-
checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
568+
checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
569569
dependencies = [
570570
"adler2",
571571
]

Diff for: src/tools/miri/test_dependencies/Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
156156

157157
[[package]]
158158
name = "miniz_oxide"
159-
version = "0.8.7"
159+
version = "0.8.8"
160160
source = "registry+https://github.com/rust-lang/crates.io-index"
161-
checksum = "ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430"
161+
checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
162162
dependencies = [
163163
"adler2",
164164
]

Diff for: src/tools/rustbook/Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -981,9 +981,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
981981

982982
[[package]]
983983
name = "miniz_oxide"
984-
version = "0.8.7"
984+
version = "0.8.8"
985985
source = "registry+https://github.com/rust-lang/crates.io-index"
986-
checksum = "ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430"
986+
checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
987987
dependencies = [
988988
"adler2",
989989
]

0 commit comments

Comments
 (0)