nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 12:21:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

fusee/sept: ensure proper array initialization in exception handling

Browse source
This commit is contained in:
hexkyz 2020-07-14 18:58:19 +01:00
parent fef8a4918e
commit f71ad5ac2c
3 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fusee/fusee-primary/src/exception_handlers.c
View file

@ -38,7 +38,7 @@ static const char *register_names[] = {
/* Adapted from https://gist.github.com/ccbrown/9722406 */ /* Adapted from https://gist.github.com/ccbrown/9722406 */
static void hexdump(const void* data, size_t size, uintptr_t addrbase, char* strbuf) { static void hexdump(const void* data, size_t size, uintptr_t addrbase, char* strbuf) {
const uint8_t *d = (const uint8_t *)data; const uint8_t *d = (const uint8_t *)data;
char ascii[17]; char ascii[17] = {0};
ascii[16] = '\0'; ascii[16] = '\0';
for (size_t i = 0; i < size; i++) { for (size_t i = 0; i < size; i++) {
@ -79,17 +79,17 @@ void setup_exception_handlers(void) {
} }
void exception_handler_main(uint32_t *registers, unsigned int exception_type) { void exception_handler_main(uint32_t *registers, unsigned int exception_type) {
char exception_log[0x400]; char exception_log[0x400] = {0};
uint8_t code_dump[CODE_DUMP_SIZE]; uint8_t code_dump[CODE_DUMP_SIZE] = {0};
uint8_t stack_dump[STACK_DUMP_SIZE]; uint8_t stack_dump[STACK_DUMP_SIZE] = {0};
size_t code_dump_size; size_t code_dump_size = 0;
size_t stack_dump_size; size_t stack_dump_size = 0;
uint32_t pc = registers[15]; uint32_t pc = registers[15];
uint32_t cpsr = registers[16]; uint32_t cpsr = registers[16];
uint32_t instr_addr = pc + ((cpsr & 0x20) ? 2 : 4) - CODE_DUMP_SIZE; uint32_t instr_addr = pc + ((cpsr & 0x20) ? 2 : 4) - CODE_DUMP_SIZE;
sprintf(exception_log + strlen(exception_log), "An exception occured!\n"); sprintf(exception_log, "An exception occured!\n");
code_dump_size = safecpy(code_dump, (const void *)instr_addr, CODE_DUMP_SIZE); code_dump_size = safecpy(code_dump, (const void *)instr_addr, CODE_DUMP_SIZE);
stack_dump_size = safecpy(stack_dump, (const void *)registers[13], STACK_DUMP_SIZE); stack_dump_size = safecpy(stack_dump, (const void *)registers[13], STACK_DUMP_SIZE);

14
fusee/fusee-secondary/src/exception_handlers.c
View file

@ -39,7 +39,7 @@ static const char *register_names[] = {
/* Adapted from https://gist.github.com/ccbrown/9722406 */ /* Adapted from https://gist.github.com/ccbrown/9722406 */
static void hexdump(const void* data, size_t size, uintptr_t addrbase, char* strbuf) { static void hexdump(const void* data, size_t size, uintptr_t addrbase, char* strbuf) {
const uint8_t *d = (const uint8_t *)data; const uint8_t *d = (const uint8_t *)data;
char ascii[17]; char ascii[17] = {0};
ascii[16] = '\0'; ascii[16] = '\0';
for (size_t i = 0; i < size; i++) { for (size_t i = 0; i < size; i++) {
@ -80,17 +80,17 @@ void setup_exception_handlers(void) {
} }
void exception_handler_main(uint32_t *registers, unsigned int exception_type) { void exception_handler_main(uint32_t *registers, unsigned int exception_type) {
char exception_log[0x400]; char exception_log[0x400] = {0};
uint8_t code_dump[CODE_DUMP_SIZE]; uint8_t code_dump[CODE_DUMP_SIZE] = {0};
uint8_t stack_dump[STACK_DUMP_SIZE]; uint8_t stack_dump[STACK_DUMP_SIZE] = {0};
size_t code_dump_size; size_t code_dump_size = 0;
size_t stack_dump_size; size_t stack_dump_size = 0;
uint32_t pc = registers[15]; uint32_t pc = registers[15];
uint32_t cpsr = registers[16]; uint32_t cpsr = registers[16];
uint32_t instr_addr = pc + ((cpsr & 0x20) ? 2 : 4) - CODE_DUMP_SIZE; uint32_t instr_addr = pc + ((cpsr & 0x20) ? 2 : 4) - CODE_DUMP_SIZE;
sprintf(exception_log + strlen(exception_log), "An exception occured!\n"); sprintf(exception_log, "An exception occured!\n");
code_dump_size = safecpy(code_dump, (const void *)instr_addr, CODE_DUMP_SIZE); code_dump_size = safecpy(code_dump, (const void *)instr_addr, CODE_DUMP_SIZE);
stack_dump_size = safecpy(stack_dump, (const void *)registers[13], STACK_DUMP_SIZE); stack_dump_size = safecpy(stack_dump, (const void *)registers[13], STACK_DUMP_SIZE);

14
sept/sept-secondary/src/exception_handlers.c
View file

@ -38,7 +38,7 @@ static const char *register_names[] = {
/* Adapted from https://gist.github.com/ccbrown/9722406 */ /* Adapted from https://gist.github.com/ccbrown/9722406 */
static void hexdump(const void* data, size_t size, uintptr_t addrbase, char* strbuf) { static void hexdump(const void* data, size_t size, uintptr_t addrbase, char* strbuf) {
const uint8_t *d = (const uint8_t *)data; const uint8_t *d = (const uint8_t *)data;
char ascii[17]; char ascii[17] = {0};
ascii[16] = '\0'; ascii[16] = '\0';
for (size_t i = 0; i < size; i++) { for (size_t i = 0; i < size; i++) {
@ -79,17 +79,17 @@ void setup_exception_handlers(void) {
} }
void exception_handler_main(uint32_t *registers, unsigned int exception_type) { void exception_handler_main(uint32_t *registers, unsigned int exception_type) {
char exception_log[0x400]; char exception_log[0x400] = {0};
uint8_t code_dump[CODE_DUMP_SIZE]; uint8_t code_dump[CODE_DUMP_SIZE] = {0};
uint8_t stack_dump[STACK_DUMP_SIZE]; uint8_t stack_dump[STACK_DUMP_SIZE] = {0};
size_t code_dump_size; size_t code_dump_size = 0;
size_t stack_dump_size; size_t stack_dump_size = 0;
uint32_t pc = registers[15]; uint32_t pc = registers[15];
uint32_t cpsr = registers[16]; uint32_t cpsr = registers[16];
uint32_t instr_addr = pc + ((cpsr & 0x20) ? 2 : 4) - CODE_DUMP_SIZE; uint32_t instr_addr = pc + ((cpsr & 0x20) ? 2 : 4) - CODE_DUMP_SIZE;
sprintf(exception_log + strlen(exception_log), "An exception occured!\n"); sprintf(exception_log, "An exception occured!\n");
code_dump_size = safecpy(code_dump, (const void *)instr_addr, CODE_DUMP_SIZE); code_dump_size = safecpy(code_dump, (const void *)instr_addr, CODE_DUMP_SIZE);
stack_dump_size = safecpy(stack_dump, (const void *)registers[13], STACK_DUMP_SIZE); stack_dump_size = safecpy(stack_dump, (const void *)registers[13], STACK_DUMP_SIZE);