Max/SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #352 from NieDzejkob/value-to-string-oob

Browse Source 
value_to_string: use snprintf
This commit is contained in:
Lior Halphon 2021-02-28 15:23:29 +02:00 committed by GitHub
commit 0fbd714d4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Core/debugger.c
View File

@ -125,36 +125,32 @@ static inline void switch_banking_state(GB_gameboy_t *gb, uint16_t bank)
static const char *value_to_string(GB_gameboy_t *gb, uint16_t value, bool prefer_name) static const char *value_to_string(GB_gameboy_t *gb, uint16_t value, bool prefer_name)
{ {
static __thread char output[256]; static __thread char output[256];
output[sizeof(output) - 1] = 0; // Ensure termination
const GB_bank_symbol_t *symbol = GB_debugger_find_symbol(gb, value); const GB_bank_symbol_t *symbol = GB_debugger_find_symbol(gb, value);
if (symbol && (value - symbol->addr > 0x1000 || symbol->addr == 0) ) { if (symbol && (value - symbol->addr > 0x1000 || symbol->addr == 0) ) {
symbol = NULL; symbol = NULL;
} }
/* Avoid overflow */
if (symbol && strlen(symbol->name) >= 240) {
symbol = NULL;
}
if (!symbol) { if (!symbol) {
sprintf(output, "$%04x", value); snprintf(output, sizeof(output) - 1, "$%04x", value);
} }
else if (symbol->addr == value) { else if (symbol->addr == value) {
if (prefer_name) { if (prefer_name) {
sprintf(output, "%s ($%04x)", symbol->name, value); snprintf(output, sizeof(output) - 1, "%s ($%04x)", symbol->name, value);
} }
else { else {
sprintf(output, "$%04x (%s)", value, symbol->name); snprintf(output, sizeof(output) - 1, "$%04x (%s)", value, symbol->name);
} }
} }
else { else {
if (prefer_name) { if (prefer_name) {
sprintf(output, "%s+$%03x ($%04x)", symbol->name, value - symbol->addr, value); snprintf(output, sizeof(output) - 1, "%s+$%03x ($%04x)", symbol->name, value - symbol->addr, value);
} }
else { else {
sprintf(output, "$%04x (%s+$%03x)", value, symbol->name, value - symbol->addr); snprintf(output, sizeof(output) - 1, "$%04x (%s+$%03x)", value, symbol->name, value - symbol->addr);
} }
} }
return output; return output;
@ -165,36 +161,32 @@ static const char *debugger_value_to_string(GB_gameboy_t *gb, value_t value, boo
if (!value.has_bank) return value_to_string(gb, value.value, prefer_name); if (!value.has_bank) return value_to_string(gb, value.value, prefer_name);
static __thread char output[256]; static __thread char output[256];
output[sizeof(output) - 1] = 0; // Ensure termination
const GB_bank_symbol_t *symbol = GB_map_find_symbol(gb->bank_symbols[value.bank], value.value); const GB_bank_symbol_t *symbol = GB_map_find_symbol(gb->bank_symbols[value.bank], value.value);
if (symbol && (value.value - symbol->addr > 0x1000 || symbol->addr == 0) ) { if (symbol && (value.value - symbol->addr > 0x1000 || symbol->addr == 0) ) {
symbol = NULL; symbol = NULL;
} }
/* Avoid overflow */
if (symbol && strlen(symbol->name) >= 240) {
symbol = NULL;
}
if (!symbol) { if (!symbol) {
sprintf(output, "$%02x:$%04x", value.bank, value.value); snprintf(output, sizeof(output) - 1, "$%02x:$%04x", value.bank, value.value);
} }
else if (symbol->addr == value.value) { else if (symbol->addr == value.value) {
if (prefer_name) { if (prefer_name) {
sprintf(output, "%s ($%02x:$%04x)", symbol->name, value.bank, value.value); snprintf(output, sizeof(output) - 1, "%s ($%02x:$%04x)", symbol->name, value.bank, value.value);
} }
else { else {
sprintf(output, "$%02x:$%04x (%s)", value.bank, value.value, symbol->name); snprintf(output, sizeof(output) - 1, "$%02x:$%04x (%s)", value.bank, value.value, symbol->name);
} }
} }
else { else {
if (prefer_name) { if (prefer_name) {
sprintf(output, "%s+$%03x ($%02x:$%04x)", symbol->name, value.value - symbol->addr, value.bank, value.value); snprintf(output, sizeof(output) - 1, "%s+$%03x ($%02x:$%04x)", symbol->name, value.value - symbol->addr, value.bank, value.value);
} }
else { else {
sprintf(output, "$%02x:$%04x (%s+$%03x)", value.bank, value.value, symbol->name, value.value - symbol->addr); snprintf(output, sizeof(output) - 1, "$%02x:$%04x (%s+$%03x)", value.bank, value.value, symbol->name, value.value - symbol->addr);
} }
} }
return output; return output;