chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Highly Complete: Add exception handling for NCSF

Browse source 
SSEQPlayer throws exceptions, there should be exception
handling to catch them and fail gracefully.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
This commit is contained in:
Christopher Snowhill 2025-01-30 00:38:21 -08:00
parent 7777e50f03
commit d835c252fa
1 changed files with 80 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm
View file

@ -1062,14 +1062,18 @@ static int usf_info(void *context, const char *name, const char *value) {
if(state.state) free(state.state); if(state.state) free(state.state);
} else if(type == 0x25) { } else if(type == 0x25) {
struct ncsf_loader_state *state = new struct ncsf_loader_state; struct ncsf_loader_state *state = NULL;
Player *player = NULL;
try {
state = new struct ncsf_loader_state;
if(psf_load([currentUrl UTF8String], &source_callbacks, 0x25, ncsf_loader, state, 0, 0, 0) <= 0) { if(psf_load([currentUrl UTF8String], &source_callbacks, 0x25, ncsf_loader, state, 0, 0, 0) <= 0) {
delete state; delete state;
return NO; return NO;
} }
Player *player = new Player; player = new Player;
player->interpolation = INTERPOLATION_SINC; player->interpolation = INTERPOLATION_SINC;
@ -1088,6 +1092,14 @@ static int usf_info(void *context, const char *name, const char *value) {
emulatorCore = (uint8_t *)player; emulatorCore = (uint8_t *)player;
emulatorExtra = state; emulatorExtra = state;
} catch (std::exception &e) {
ALog(@"Exception caught creating NCSF player: %s", e.what());
emulatorCore = NULL;
emulatorExtra = NULL;
delete player;
delete state;
return NO;
}
} else if(type == 0x41) { } else if(type == 0x41) {
struct qsf_loader_state *state = (struct qsf_loader_state *)calloc(1, sizeof(*state)); struct qsf_loader_state *state = (struct qsf_loader_state *)calloc(1, sizeof(*state));
@ -1281,6 +1293,7 @@ static int usf_info(void *context, const char *name, const char *value) {
NDS_state *state = (NDS_state *)emulatorCore; NDS_state *state = (NDS_state *)emulatorCore;
state_render(state, (s16 *)buf, frames); state_render(state, (s16 *)buf, frames);
} else if(type == 0x25) { } else if(type == 0x25) {
try {
Player *player = (Player *)emulatorCore; Player *player = (Player *)emulatorCore;
ncsf_loader_state *state = (ncsf_loader_state *)emulatorExtra; ncsf_loader_state *state = (ncsf_loader_state *)emulatorExtra;
std::vector<uint8_t> &buffer = state->outputBuffer; std::vector<uint8_t> &buffer = state->outputBuffer;
@ -1294,6 +1307,10 @@ static int usf_info(void *context, const char *name, const char *value) {
buf = ((uint8_t *)buf) + frames_this_run * sizeof(int16_t) * 2; buf = ((uint8_t *)buf) + frames_this_run * sizeof(int16_t) * 2;
frames_to_do -= frames_this_run; frames_to_do -= frames_this_run;
} }
} catch (std::exception &e) {
ALog(@"Exception caught while playing NCSF: %s", e.what());
return 0;
}
} else if(type == 0x41) { } else if(type == 0x41) {
uint32_t howmany = frames; uint32_t howmany = frames;
qsound_execute(emulatorCore, 0x7fffffff, (int16_t *)buf, &howmany); qsound_execute(emulatorCore, 0x7fffffff, (int16_t *)buf, &howmany);
@ -1367,8 +1384,12 @@ static int usf_info(void *context, const char *name, const char *value) {
state_deinit(state); state_deinit(state);
free(state); free(state);
} else if(type == 0x25) { } else if(type == 0x25) {
try {
Player *player = (Player *)emulatorCore; Player *player = (Player *)emulatorCore;
delete player; delete player;
} catch (std::exception &e) {
ALog(@"Exception caught deleting NCSF player: %s", e.what());
}
} else { } else {
free(emulatorCore); free(emulatorCore);
} }
@ -1387,8 +1408,12 @@ static int usf_info(void *context, const char *name, const char *value) {
free(emulatorExtra); free(emulatorExtra);
emulatorExtra = nil; emulatorExtra = nil;
} else if(type == 0x25 && emulatorExtra) { } else if(type == 0x25 && emulatorExtra) {
try {
struct ncsf_loader_state *state = (struct ncsf_loader_state *)emulatorExtra; struct ncsf_loader_state *state = (struct ncsf_loader_state *)emulatorExtra;
delete state; delete state;
} catch (std::exception &e) {
ALog(@"Exception caught deleting NCSF state: %s", e.what());
}
emulatorExtra = nil; emulatorExtra = nil;
} else if(type == 0x41 && emulatorExtra) { } else if(type == 0x41 && emulatorExtra) {
struct qsf_loader_state *state = (struct qsf_loader_state *)emulatorExtra; struct qsf_loader_state *state = (struct qsf_loader_state *)emulatorExtra;
@ -1497,6 +1522,7 @@ static int usf_info(void *context, const char *name, const char *value) {
framesRead = frame; framesRead = frame;
} else if(type == 0x25) { } else if(type == 0x25) {
try {
Player *player = (Player *)emulatorCore; Player *player = (Player *)emulatorCore;
ncsf_loader_state *state = (ncsf_loader_state *)emulatorExtra; ncsf_loader_state *state = (ncsf_loader_state *)emulatorExtra;
std::vector<uint8_t> &buffer = state->outputBuffer; std::vector<uint8_t> &buffer = state->outputBuffer;
@ -1513,6 +1539,11 @@ static int usf_info(void *context, const char *name, const char *value) {
} }
framesRead = frame; framesRead = frame;
} catch (std::exception &e) {
ALog(@"Exception caught while seeking in NCSF: %s", e.what());
framesRead = 0;
return -1;
}
} else if(type == 0x41) { } else if(type == 0x41) {
do { do {
uint32_t howmany = (uint32_t)(frame - framesRead); uint32_t howmany = (uint32_t)(frame - framesRead);