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

Fix decompression of garbage data after valid gzip data causing decompression to fail #7119

Merged
merged 3 commits into from
Jun 5, 2023
Merged

Fix decompression of garbage data after valid gzip data causing decompression to fail #7119

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
7044989
Fix decompression of garbage data after valid gzip data causing decom…
frcroth Jun 2, 2023
9bed786
Merge branch 'master' into fix-gzip-junk
fm3 Jun 5, 2023
52541eb
Update changelog
frcroth Jun 5, 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
1 change: 1 addition & 0 deletions CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released

### Fixed
- Fixed a bug where some volume annotations could not be downloaded. [#7115](https://github.com/scalableminds/webknossos/pull/7115)
- Fixed reading of some remote datasets where invalid data would follow valid gzip data, causing the decompression to fail. [#7119](https://github.com/scalableminds/webknossos/pull/7119)

### Removed
- Support for [webknososs-connect](https://github.com/scalableminds/webknossos-connect) data store servers has been removed. Use the "Add Remote Dataset" functionality instead. [#7031](https://github.com/scalableminds/webknossos/pull/7031)
Expand Down
2 changes: 1 addition & 1 deletion webknossos-datastore/app/com/scalableminds/webknossos/datastore/datareaders/Compressor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ class GzipCompressor(val properties: Map[String, CompressionSetting]) extends Co
override def decompress(input: Array[Byte]): Array[Byte] = {
val is = new ByteArrayInputStream(input)
val os = new ByteArrayOutputStream()
val iis = new GzipCompressorInputStream(is, true)
val iis = new GzipCompressorInputStream(is, false)
try passThrough(iis, os)
finally if (iis != null) iis.close()
os.toByteArray
Expand Down