alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-10-17 15:41:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

prevent panics on core load failure

Browse source
This commit is contained in:
Corwin 2021-07-03 16:33:26 +00:00 committed by GitHub
parent 7ab17d7a4e
commit eb538b4536
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mgba-test-runner/c/test-runner.c
View file

@ -31,6 +31,7 @@ struct MGBA* new_runner(char* filename) {
struct mCore* core = mCoreFind(mgba->filename); struct mCore* core = mCoreFind(mgba->filename);
if (!core) { if (!core) {
printf("failed to find core\n"); printf("failed to find core\n");
free(mgba);
return NULL; return NULL;
} }

2
mgba-test-runner/src/main.rs
View file

@ -20,7 +20,7 @@ fn test_file(file_to_run: &str) -> Status {
let mut finished = Status::Running; let mut finished = Status::Running;
let debug_reader_mutex = Regex::new(r"(?s)^\[(.*)\] GBA Debug: (.*)$").unwrap(); let debug_reader_mutex = Regex::new(r"(?s)^\[(.*)\] GBA Debug: (.*)$").unwrap();
let mut mgba = runner::MGBA::new(file_to_run); let mut mgba = runner::MGBA::new(file_to_run).unwrap();
let video_buffer = mgba.get_video_buffer(); let video_buffer = mgba.get_video_buffer();
mgba.set_logger(|message| { mgba.set_logger(|message| {

9
mgba-test-runner/src/runner.rs
View file

@ -35,10 +35,13 @@ impl VideoBuffer {
} }
impl MGBA { impl MGBA {
pub fn new(filename: &str) -> Self { pub fn new(filename: &str) -> Result<Self, anyhow::Error> {
let c_str = CString::new(filename).expect("should be able to make cstring from filename"); let c_str = CString::new(filename).expect("should be able to make cstring from filename");
MGBA { let mgba = unsafe { bindings::new_runner(c_str.as_ptr() as *mut i8) };
mgba: unsafe { bindings::new_runner(c_str.as_ptr() as *mut i8) }, if mgba.is_null() {
Err(anyhow::anyhow!("could not create core"))
} else {
Ok(MGBA { mgba })
} }
} }