From ffe22b238ee23cb6a83ccc9f0650de495bc089b0 Mon Sep 17 00:00:00 2001 From: Philip Craig Date: Sat, 29 Jun 2024 12:24:20 +1000 Subject: [PATCH 1/4] Update wasmparser dependency --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 367da9ad..e193dcd1 100755 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ features = ['doc'] crc32fast = { version = "1.2", default-features = false, optional = true } flate2 = { version = "1", optional = true } indexmap = { version = "2.0", default-features = false, optional = true } -wasmparser = { version = "0.209.1", default-features = false, optional = true } +wasmparser = { version = "0.212.0", default-features = false, optional = true } memchr = { version = "2.4.1", default-features = false } hashbrown = { version = "0.14.0", features = ["ahash"], default-features = false, optional = true } ruzstd = { version = "0.7.0", optional = true } From 8a6e84b0300e2c65ed1ed51fc39d19a0ad35abf3 Mon Sep 17 00:00:00 2001 From: Philip Craig Date: Sat, 29 Jun 2024 12:24:32 +1000 Subject: [PATCH 2/4] Update Cargo.lock --- Cargo.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 81d7fba8..af5129f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -77,9 +77,9 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "byteorder" @@ -128,9 +128,9 @@ checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "compiler_builtins" -version = "0.1.112" +version = "0.1.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15acab2bb4fe4dad1f1e31f3d9e714f50ef561a0f87dd8a9da004f14d455e1a" +checksum = "f7a6025b8e1885a239509ec7a00859e721eecb5725a64206ab1a6a96f7b55660" [[package]] name = "crc32fast" @@ -215,9 +215,9 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" dependencies = [ "compiler_builtins", "rustc-std-workspace-core", @@ -234,9 +234,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] @@ -287,9 +287,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -339,9 +339,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.66" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -378,9 +378,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "wasmparser" -version = "0.209.1" +version = "0.212.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07035cc9a9b41e62d3bb3a3815a66ab87c993c06fe1cf6b2a3f2a18499d937db" +checksum = "8d28bc49ba1e5c5b61ffa7a2eace10820443c4b7d1c0b144109261d14570fdf8" dependencies = [ "bitflags", ] From 1b6718ff9d67add72ecb6aaabd1c03a8b02df02e Mon Sep 17 00:00:00 2001 From: Philip Craig Date: Sat, 29 Jun 2024 12:25:08 +1000 Subject: [PATCH 3/4] Fix clippy warning --- src/read/coff/section.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/read/coff/section.rs b/src/read/coff/section.rs index 28b5e2e7..280b5c43 100644 --- a/src/read/coff/section.rs +++ b/src/read/coff/section.rs @@ -573,7 +573,7 @@ impl pe::ImageSectionHeader { ) -> read::Result<&'data [pe::ImageRelocation]> { let mut pointer = self.pointer_to_relocations.get(LE).into(); let mut number: usize = self.number_of_relocations.get(LE).into(); - if number == core::u16::MAX.into() + if number == u16::MAX.into() && self.characteristics.get(LE) & pe::IMAGE_SCN_LNK_NRELOC_OVFL != 0 { // Extended relocations. Read first relocation (which contains extended count) & adjust From b7095de0316c3fcac2fd2dc5f9eb1f724a79866d Mon Sep 17 00:00:00 2001 From: Philip Craig Date: Sat, 29 Jun 2024 12:40:46 +1000 Subject: [PATCH 4/4] Release 0.36.1 --- CHANGELOG.md | 29 +++++++++++++++++++++++++++++ Cargo.lock | 2 +- Cargo.toml | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbf9a64a..9a5290a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,35 @@ -------------------------------------------------------------------------------- +## 0.36.1 + +Released 2024/06/29. + +### Added + +* Added `SectionKind::DebugString`. + [#694](https://github.com/gimli-rs/object/pull/694) + +* Added `Architecture::Sparc` and `Architecture::Sparc32Plus`. + [#699](https://github.com/gimli-rs/object/pull/699) + [#700](https://github.com/gimli-rs/object/pull/700) + +* Added more RISC-V ELF relocation constants. + [#701](https://github.com/gimli-rs/object/pull/701) + +### Changed + +* Changed `read::ElfFile::imports` to return the library for versioned symbols. + [#693](https://github.com/gimli-rs/object/pull/693) + +* Changed `read::MachOFile` to support Go's debug section compression. + [#697](https://github.com/gimli-rs/object/pull/697) + +* Reversed the order of Mach-O relocations emitted by `write::Object`. + [#702](https://github.com/gimli-rs/object/pull/702) + +-------------------------------------------------------------------------------- + ## 0.36.0 Released 2024/05/26. diff --git a/Cargo.lock b/Cargo.lock index af5129f1..8be71010 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -243,7 +243,7 @@ dependencies = [ [[package]] name = "object" -version = "0.36.0" +version = "0.36.1" dependencies = [ "compiler_builtins", "crc32fast", diff --git a/Cargo.toml b/Cargo.toml index e193dcd1..0cc6b5dc 100755 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "object" -version = "0.36.0" +version = "0.36.1" edition = "2018" keywords = ["object", "elf", "mach-o", "pe", "coff"] license = "Apache-2.0 OR MIT"