M src/arm/debugger/cli-debugger.c → src/arm/debugger/cli-debugger.c

@@ -93,7 +93,7 @@ }
 
 static inline uint32_t _printLine(struct CLIDebugger* debugger, uint32_t address, enum ExecutionMode mode) {
 	struct CLIDebuggerBackend* be = debugger->backend;
-	char disassembly[48];
+	char disassembly[64];
 	struct ARMInstructionInfo info;
 	be->printf(be, "%08X:  ", address);
 	if (mode == MODE_ARM) {

M src/arm/decoder.c → src/arm/decoder.c

@@ -8,7 +8,7 @@
 #include <mgba/internal/arm/decoder-inlines.h>
 
 #define ADVANCE(AMOUNT) \
-	if (AMOUNT > blen) { \
+	if (AMOUNT >= blen) { \
 		buffer[blen - 1] = '\0'; \
 		return total; \
 	} \

M src/lr35902/decoder.c → src/lr35902/decoder.c

@@ -409,7 +409,7 @@ return decoder(opcode, info);
 }
 
 #define ADVANCE(AMOUNT) \
-	if (AMOUNT > blen) { \
+	if (AMOUNT >= blen) { \
 		buffer[blen - 1] = '\0'; \
 		return total; \
 	} \