Skip to content

Commit

Permalink
build: update prettytable to 0.10 to fix UB in 0.9 which rustc 1.67.0…
Browse files Browse the repository at this point in the history
… now exploits
  • Loading branch information
m4b committed Jan 28, 2023
1 parent 8596f7f commit 0b5c1d7
Show file tree
Hide file tree
Showing 8 changed files with 196 additions and 65 deletions.
245 changes: 190 additions & 55 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ termcolor = "1"
rustc-demangle = "0.1"
cpp_demangle = "0.3"
scroll = "0.11"
prettytable-rs = "0.9"
prettytable-rs = "0.10"
env_logger = "0.9"
anyhow = "1"
clap = { version = "3", features = ["derive", "wrap_help"] }
Expand Down
2 changes: 1 addition & 1 deletion src/format_archive.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use anyhow::Error;
use metagoblin::archive;
use prettytable::{Cell, Row};
use prettytable::{row, Cell, Row};

use crate::format::*;
use crate::Opt;
Expand Down
2 changes: 1 addition & 1 deletion src/format_elf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use metagoblin::elf::{
dynamic, header, program_header, reloc, section_header, sym, Dynamic, RelocSection,
};
use metagoblin::strtab::Strtab;
use prettytable::{Cell, Row, Table};
use prettytable::{row, Cell, Row, Table};
use scroll::ctx::StrCtx;
use scroll::Pread;
use termcolor::Color::*;
Expand Down
3 changes: 1 addition & 2 deletions src/format_mach.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ use metagoblin::mach;
use metagoblin::mach::exports::Export;
use metagoblin::mach::header;
use metagoblin::mach::load_command;
use prettytable::Table;
use prettytable::{Cell, Row};
use prettytable::{row, Cell, Row, Table};
use termcolor::Color::*;
use termcolor::{Buffer, BufferWriter, ColorChoice, ColorSpec, WriteColor};

Expand Down
2 changes: 1 addition & 1 deletion src/format_meta.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use anyhow::Error;
use hexplay::{self, HexViewBuilder, CODEPAGE_ASCII};
use metagoblin::{Object, Tag};
use prettytable::{Cell, Row};
use prettytable::{row, Cell, Row};

use crate::format::*;
use crate::Opt;
Expand Down
2 changes: 1 addition & 1 deletion src/format_pe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use metagoblin::pe::header::*;
use metagoblin::pe::import::Import;
use metagoblin::pe::optional_header::OptionalHeader;
use metagoblin::pe::section_table::{SectionTable, IMAGE_SCN_ALIGN_MASK};
use prettytable::{Cell, Row};
use prettytable::{row, Cell, Row};
use scroll::ctx::StrCtx;
use scroll::Pread;
use termcolor::{Buffer, BufferWriter, Color, ColorChoice, ColorSpec, WriteColor};
Expand Down
3 changes: 0 additions & 3 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#[macro_use]
extern crate prettytable;

mod format;
mod format_archive;
mod format_elf;
Expand Down

0 comments on commit 0b5c1d7

Please sign in to comment.