encounter
/
decomp-toolkit
mirror of https://github.com/encounter/decomp-toolkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix string detection overwriting known symbols

This commit is contained in:
Luke Street 2023-08-03 18:50:27 -04:00
parent 6b81faa5e1
commit b267b79f7b
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/analysis/objects.rs
View File

@ -85,6 +85,9 @@ pub fn detect_strings(obj: &mut ObjInfo) -> Result<()> {
} }
fn is_string(data: &[u8]) -> StringResult { fn is_string(data: &[u8]) -> StringResult {
let bytes = trim_zeroes_end(data); let bytes = trim_zeroes_end(data);
if bytes.is_empty() {
return StringResult::None;
}
if bytes.iter().all(|&c| c.is_ascii_graphic() || c.is_ascii_whitespace()) { if bytes.iter().all(|&c| c.is_ascii_graphic() || c.is_ascii_whitespace()) {
return StringResult::String { return StringResult::String {
length: bytes.len(), length: bytes.len(),
@ -124,25 +127,24 @@ pub fn detect_strings(obj: &mut ObjInfo) -> Result<()> {
match is_string(data) { match is_string(data) {
StringResult::None => {} StringResult::None => {}
StringResult::String { length, terminated } => { StringResult::String { length, terminated } => {
if length > 0 { let size = if terminated { length + 1 } else { length };
if !symbol.size_known || symbol.size == size as u64 {
let str = String::from_utf8_lossy(&data[..length]); let str = String::from_utf8_lossy(&data[..length]);
log::debug!("Found string '{}' @ {}", str, symbol.name); log::debug!("Found string '{}' @ {}", str, symbol.name);
symbols_set.push(( symbols_set.push((symbol_idx, ObjDataKind::String, size));
symbol_idx,
ObjDataKind::String,
if terminated { length + 1 } else { length },
));
} }
} }
StringResult::WString { length, str } => { StringResult::WString { length, str } => {
if length > 0 { let size = length + 2;
if !symbol.size_known || symbol.size == size as u64 {
log::debug!("Found wide string '{}' @ {}", str, symbol.name); log::debug!("Found wide string '{}' @ {}", str, symbol.name);
symbols_set.push((symbol_idx, ObjDataKind::String16, length + 2)); symbols_set.push((symbol_idx, ObjDataKind::String16, size));
} }
} }
} }
} }
} }
for (symbol_idx, data_kind, size) in symbols_set { for (symbol_idx, data_kind, size) in symbols_set {
let mut symbol = obj.symbols.at(symbol_idx).clone(); let mut symbol = obj.symbols.at(symbol_idx).clone();
log::debug!("Setting {} ({:#010X}) to size {:#X}", symbol.name, symbol.address, size); log::debug!("Setting {} ({:#010X}) to size {:#X}", symbol.name, symbol.address, size);