Skip to content

Commit

Permalink
update rusttype to 0.9.2, but find it still relies on old crossbeam…
Browse files Browse the repository at this point in the history
…-utils

    Specifically, we still rely on crossbeam-utils v0.7.2, which has a known vulnerability fixed in v0.8.7

    It does not seem worth putting more effort into this at this time for two reasons:

    * Using `rote` does not involve connecting to the internet.
    * The vulnerability only affects 32-bit targets according to crossbeam-rs/crossbeam#781 . I'm not running `rote` on any of those at the moment, anyway.

    If `rusttype` releases the fixed version to `crates.io` then running `cargo update` will fix it for me, so I plan to wait until some time after that is released to address this.
  • Loading branch information
Ryan1729 committed Jun 10, 2022
1 parent 306037c commit f3f46ed
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 81 deletions.
133 changes: 55 additions & 78 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion libs/platform_layer/libs/wimp/Cargo.toml
Expand Up @@ -17,7 +17,6 @@ if_changed = { path = "../../../if_changed" }
perf_viz = { path = "../../../perf_viz" }
perf_viz_proc_macro = { path = "../../../perf_viz/libs/perf_viz_proc_macro" }
window_layer = { path = "../window_layer" }
full_rusttype = { version = "0.7.5", features = ["gpu_cache"], package = "rusttype" }
edited_storage = { path = "../edited_storage" }
shared = { path = "../shared" }
wimp_render = { path = "../wimp_render" }
Expand Down
Expand Up @@ -8,7 +8,7 @@ edition = "2021"
path = "./src/rasterizer.rs"

[dependencies]
rusttype = { version = "0.8.3", features = ["gpu_cache"], optional = true }
rusttype = { version = "0.9.2", features = ["gpu_cache"], optional = true }
glyph_brush_draw_cache = { version = "0.1.1", optional = true }
gl_layer_types = { path = "../../gl_layer_types" }
macros = { path = "../../../../../../macros" }
Expand Up @@ -458,7 +458,8 @@ pub const FONT_LICENSE: &str = include_str!("./fonts/LICENSE");
/// # Errors
/// Fails if the embedded font bytes are invalid.
pub fn new(hidpi_factor: f32) -> Res<State<'static>> {
let font = Font::from_bytes(FONT_BYTES)?;
let font = Font::try_from_bytes(FONT_BYTES)
.ok_or_else(|| "embedded font was invalid")?;

Ok(
State {
Expand Down

0 comments on commit f3f46ed

Please sign in to comment.