You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
36 lines
1.3 KiB
36 lines
1.3 KiB
5 years ago
|
From bf4fb0003ba1a19cab61601a2ef6fd48d0326dee Mon Sep 17 00:00:00 2001
|
||
|
|
From: Josh Stone <cuviper@gmail.com>
|
||
|
|
Date: Wed, 22 Jul 2020 15:48:17 -0700
|
||
|
|
Subject: [PATCH] Revert "Bump miniz-oxide version (#354)"
|
||
|
|
|
||
|
|
This reverts commit b0f850276c119bf517d51b20513afa4719985736.
|
||
|
|
---
|
||
|
|
src/symbolize/gimli/elf.rs | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/symbolize/gimli/elf.rs b/src/symbolize/gimli/elf.rs
|
||
|
|
index 2ca57f88a4b4..281188faacb5 100644
|
||
|
|
--- a/src/symbolize/gimli/elf.rs
|
||
|
|
+++ b/src/symbolize/gimli/elf.rs
|
||
|
|
@@ -4,6 +4,7 @@ use object::elf::{ELFCOMPRESS_ZLIB, SHF_COMPRESSED};
|
||
|
|
use object::read::elf::{CompressionHeader, FileHeader, SectionHeader, SectionTable, Sym};
|
||
|
|
use object::read::StringTable;
|
||
|
|
use object::{BigEndian, Bytes, NativeEndian};
|
||
|
|
+use std::io::Cursor;
|
||
|
|
|
||
|
|
#[cfg(target_pointer_width = "32")]
|
||
|
|
type Elf = object::elf::FileHeader32<NativeEndian>;
|
||
|
|
@@ -174,8 +175,7 @@ fn decompress_zlib(input: &[u8], output: &mut [u8]) -> Option<()> {
|
||
|
|
let (status, in_read, out_read) = decompress(
|
||
|
|
&mut DecompressorOxide::new(),
|
||
|
|
input,
|
||
|
|
- output,
|
||
|
|
- 0,
|
||
|
|
+ &mut Cursor::new(output),
|
||
|
|
TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF | TINFL_FLAG_PARSE_ZLIB_HEADER,
|
||
|
|
);
|
||
|
|
if status == TINFLStatus::Done && in_read == input.len() && out_read == output.len() {
|
||
|
|
--
|
||
|
|
2.26.2
|
||
|
|
|