From ef2997f9eb9b8767305bb905a00abe9da992a17d Mon Sep 17 00:00:00 2001 From: Afloat Date: Wed, 11 Nov 2026 01:34:53 +0800 Subject: [PATCH] Port EVM inspection: Preserve EVM bytecode when metadata map keys are ambiguous (R3.12) (#1508) Source: storytold/craft-anything@a7e66ab5982afe34d0905bbfe9c65d260f41c455:crates/formats/src/evm.rs --- crates/evm/src/lib.rs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/crates/evm/src/lib.rs b/crates/evm/src/lib.rs index 059252dc4..b2a439780 100644 --- a/crates/evm/src/lib.rs +++ b/crates/evm/src/lib.rs @@ -338,10 +338,15 @@ fn cbor_item(b: &[u8], pos: &mut usize, depth: u32) -> Option { } let mut m = Map::new(); for _ in 0..n { - let k = match cbor_item(b, pos, depth + 1)? { - Value::String(s) => s, - other => other.to_string(), - }; + // The metadata view uses JSON object keys. Coercing other CBOR key + // types to strings can merge distinct keys and hide bytecode. + if b.get(*pos).map(|byte| byte >> 5) != Some(3) { + return None; + } + let Value::String(k) = cbor_item(b, pos, depth + 1)? else { return None }; + if m.contains_key(&k) { + return None; + } let v = cbor_item(b, pos, depth + 1)?; let v = match (k.as_str(), &v) { ("solc", Value::String(s)) if s.starts_with("0x") && s.len() == 8 => {