paoda
/
gb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore(cart): add test for all-whitespace title

This commit is contained in:
Rekai Nyangadzayi Musuka 2021-12-09 07:26:53 -04:00
parent 4c657c9832
commit 2c411d5792
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/cartridge.rs
View File

@ -70,21 +70,23 @@ impl Cartridge {
} }
fn detect_title(title_mem: &[u8; ROM_TITLE_MAX_SIZE]) -> Option<String> { fn detect_title(title_mem: &[u8; ROM_TITLE_MAX_SIZE]) -> Option<String> {
use std::str::from_utf8;
const ALT_TITLE_LEN: usize = ROM_MANUFACTURER_START - ROM_TITLE_START; const ALT_TITLE_LEN: usize = ROM_MANUFACTURER_START - ROM_TITLE_START;
// byte slice we have here is purposely not null terminated // ascii byte slie does not have a null-terminator
let ascii = match title_mem.iter().position(|b| *b == 0x00) { let ascii = match title_mem.iter().position(|b| *b == 0x00) {
Some(end) => &title_mem[0..end], Some(end) => &title_mem[..end],
None => &title_mem[0..ROM_TITLE_MAX_SIZE], None => &title_mem[..ROM_TITLE_MAX_SIZE],
}; };
match std::str::from_utf8(ascii).ok() { match from_utf8(ascii).map(str::trim).ok() {
None => match std::str::from_utf8(&title_mem[0..ALT_TITLE_LEN]).ok() { None => match from_utf8(&title_mem[..ALT_TITLE_LEN]).map(str::trim).ok() {
Some("") | None => None, Some("") | None => None,
Some(title) => Some(String::from(title.trim())), Some(title) => Some(String::from(title)),
}, },
Some("") => None, Some("") => None,
Some(title) => Some(String::from(title.trim())), Some(title) => Some(String::from(title)),
} }
} }
@ -950,4 +952,14 @@ mod tests {
Cartridge::detect_title(&title) Cartridge::detect_title(&title)
); );
} }
#[test]
fn all_whitespace_title() {
let title = [
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00,
];
assert_eq!(None, Cartridge::detect_title(&title));
}
} }