M src/arm/decoder-inlines.h → src/arm/decoder-inlines.h

@@ -53,16 +53,16 @@
 static int _decodeRegister(int reg, char* buffer, int blen) {
 	switch (reg) {
 	case ARM_SP:
-		strncpy(buffer, "sp", blen);
+		strncpy(buffer, "sp", blen - 1);
 		return 2;
 	case ARM_LR:
-		strncpy(buffer, "lr", blen);
+		strncpy(buffer, "lr", blen - 1);
 		return 2;
 	case ARM_PC:
-		strncpy(buffer, "pc", blen);
+		strncpy(buffer, "pc", blen - 1);
 		return 2;
 	default:
-		return snprintf(buffer, blen, "r%i", reg);
+		return snprintf(buffer, blen - 1, "r%i", reg);
 	}
 }
 
@@ -71,7 +71,7 @@ if (blen <= 0) {
 		return 0;
 	}
 	int total = 0;
-	strncpy(buffer, "{", blen);
+	strncpy(buffer, "{", blen - 1);
 	ADVANCE(1);
 	int i;
 	int start = -1;
@@ -88,12 +88,12 @@ } else {
 				if (end > start) {
 					written = _decodeRegister(start, buffer, blen);
 					ADVANCE(written);
-					strncpy(buffer, "-", blen);
+					strncpy(buffer, "-", blen - 1);
 					ADVANCE(1);
 				}
 				written = _decodeRegister(end, buffer, blen);
 				ADVANCE(written);
-				strncpy(buffer, ",", blen);
+				strncpy(buffer, ",", blen - 1);
 				ADVANCE(1);
 				start = i;
 				end = i;
@@ -105,27 +105,27 @@ if (start >= 0) {
 		if (end > start) {
 			written = _decodeRegister(start, buffer, blen);
 			ADVANCE(written);
-			strncpy(buffer, "-", blen);
+			strncpy(buffer, "-", blen - 1);
 			ADVANCE(1);
 		}
 		written = _decodeRegister(end, buffer, blen);
 		ADVANCE(written);
 	}
-	strncpy(buffer, "}", blen);
+	strncpy(buffer, "}", blen - 1);
 	ADVANCE(1);
 	return total;
 }
 
 static int _decodePCRelative(uint32_t address, uint32_t pc, char* buffer, int blen) {
-	return snprintf(buffer, blen, "$%08X", address + pc);
+	return snprintf(buffer, blen - 1, "$%08X", address + pc);
 }
 
 static int _decodeMemory(struct ARMMemoryAccess memory, int pc, char* buffer, int blen) {
-	if (blen <= 0) {
+	if (blen <= 1) {
 		return 0;
 	}
 	int total = 0;
-	strncpy(buffer, "[", blen);
+	strncpy(buffer, "[", blen - 1);
 	ADVANCE(1);
 	int written;
 	if (memory.format & ARM_MEMORY_REGISTER_BASE) {
@@ -136,26 +136,26 @@ } else {
 			written = _decodeRegister(memory.baseReg, buffer, blen);
 			ADVANCE(written);
 			if (memory.format & (ARM_MEMORY_REGISTER_OFFSET | ARM_MEMORY_IMMEDIATE_OFFSET) && !(memory.format & ARM_MEMORY_POST_INCREMENT)) {
-				strncpy(buffer, ", ", blen);
+				strncpy(buffer, ", ", blen - 1);
 				ADVANCE(2);
 			}
 		}
 	}
 	if (memory.format & ARM_MEMORY_POST_INCREMENT) {
-		strncpy(buffer, "], ", blen);
+		strncpy(buffer, "], ", blen - 1);
 		ADVANCE(3);
 	}
 	if (memory.format & ARM_MEMORY_IMMEDIATE_OFFSET && memory.baseReg != ARM_PC) {
 		if (memory.format & ARM_MEMORY_OFFSET_SUBTRACT) {
-			written = snprintf(buffer, blen, "#-%i", memory.offset.immediate);
+			written = snprintf(buffer, blen - 1, "#-%i", memory.offset.immediate);
 			ADVANCE(written);
 		} else {
-			written = snprintf(buffer, blen, "#%i", memory.offset.immediate);
+			written = snprintf(buffer, blen - 1, "#%i", memory.offset.immediate);
 			ADVANCE(written);
 		}
 	} else if (memory.format & ARM_MEMORY_REGISTER_OFFSET) {
 		if (memory.format & ARM_MEMORY_OFFSET_SUBTRACT) {
-			strncpy(buffer, "-", blen);
+			strncpy(buffer, "-", blen - 1);
 			ADVANCE(1);
 		}
 		written = _decodeRegister(memory.offset.reg, buffer, blen);
@@ -164,11 +164,11 @@ }
 	// TODO: shifted registers
 
 	if (!(memory.format & ARM_MEMORY_POST_INCREMENT)) {
-		strncpy(buffer, "]", blen);
+		strncpy(buffer, "]", blen - 1);
 		ADVANCE(1);
 	}
 	if (memory.format & ARM_MEMORY_PRE_INCREMENT) {
-		strncpy(buffer, "!", blen);
+		strncpy(buffer, "!", blen - 1);
 		ADVANCE(1);
 	}
 	return total;

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

@@ -413,7 +413,7 @@ case ARM_MN_LDM:
 	case ARM_MN_STM:
 		written = _decodeRegister(info.memory.baseReg, buffer, blen);
 		ADVANCE(written);
-		strncpy(buffer, "!, ", blen);
+		strncpy(buffer, "!, ", blen - 1);
 		ADVANCE(3);
 		written = _decodeRegisterList(info.op1.immediate, buffer, blen);
 		ADVANCE(written);
@@ -424,7 +424,7 @@ ADVANCE(written);
 		break;
 	default:
 		if (info.operandFormat & ARM_OPERAND_IMMEDIATE_1) {
-			written = snprintf(buffer, blen, "#%i", info.op1.immediate);
+			written = snprintf(buffer, blen - 1, "#%i", info.op1.immediate);
 			ADVANCE(written);
 		} else if (info.operandFormat & ARM_OPERAND_MEMORY_1) {
 			written = _decodeMemory(info.memory, pc, buffer, blen);
@@ -438,7 +438,7 @@ strncpy(buffer, ", ", blen);
 			ADVANCE(2);
 		}
 		if (info.operandFormat & ARM_OPERAND_IMMEDIATE_2) {
-			written = snprintf(buffer, blen, "#%i", info.op2.immediate);
+			written = snprintf(buffer, blen - 1, "#%i", info.op2.immediate);
 			ADVANCE(written);
 		} else if (info.operandFormat & ARM_OPERAND_MEMORY_2) {
 			written = _decodeMemory(info.memory, pc, buffer, blen);
@@ -448,11 +448,11 @@ written = _decodeRegister(info.op2.reg, buffer, blen);
 			ADVANCE(written);
 		}
 		if (info.operandFormat & ARM_OPERAND_3) {
-			strncpy(buffer, ", ", blen);
+			strncpy(buffer, ", ", blen - 1);
 			ADVANCE(2);
 		}
 		if (info.operandFormat & ARM_OPERAND_IMMEDIATE_3) {
-			written = snprintf(buffer, blen, "#%i", info.op3.immediate);
+			written = snprintf(buffer, blen - 1, "#%i", info.op3.immediate);
 			ADVANCE(written);
 		} else if (info.operandFormat & ARM_OPERAND_MEMORY_3) {
 			written = _decodeMemory(info.memory, pc, buffer, blen);
@@ -463,6 +463,6 @@ ADVANCE(written);
 		}
 		break;
 	}
-	buffer[total] = '\0';
+	buffer[blen - 1] = '\0';
 	return total;
 }