diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 49939a5cb..12c03a515 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -800,7 +800,7 @@ static void gdb_fileio_reply(struct target *target, struct connection *connectio
 	if (strcmp(target->fileio_info->identifier, "open") == 0)
 		sprintf(fileio_command, "F%s,%" PRIx64 "/%" PRIx64 ",%" PRIx64 ",%" PRIx64, target->fileio_info->identifier,
 				target->fileio_info->param_1,
-				target->fileio_info->param_2,
+				target->fileio_info->param_2 + 1,	/* len + trailing zero */
 				target->fileio_info->param_3,
 				target->fileio_info->param_4);
 	else if (strcmp(target->fileio_info->identifier, "close") == 0)
@@ -824,13 +824,13 @@ static void gdb_fileio_reply(struct target *target, struct connection *connectio
 	else if (strcmp(target->fileio_info->identifier, "rename") == 0)
 		sprintf(fileio_command, "F%s,%" PRIx64 "/%" PRIx64 ",%" PRIx64 "/%" PRIx64, target->fileio_info->identifier,
 				target->fileio_info->param_1,
-				target->fileio_info->param_2,
+				target->fileio_info->param_2 + 1,	/* len + trailing zero */
 				target->fileio_info->param_3,
-				target->fileio_info->param_4);
+				target->fileio_info->param_4 + 1);	/* len + trailing zero */
 	else if (strcmp(target->fileio_info->identifier, "unlink") == 0)
 		sprintf(fileio_command, "F%s,%" PRIx64 "/%" PRIx64, target->fileio_info->identifier,
 				target->fileio_info->param_1,
-				target->fileio_info->param_2);
+				target->fileio_info->param_2 + 1);	/* len + trailing zero */
 	else if (strcmp(target->fileio_info->identifier, "stat") == 0)
 		sprintf(fileio_command, "F%s,%" PRIx64 "/%" PRIx64 ",%" PRIx64, target->fileio_info->identifier,
 				target->fileio_info->param_1,
@@ -850,7 +850,7 @@ static void gdb_fileio_reply(struct target *target, struct connection *connectio
 	else if (strcmp(target->fileio_info->identifier, "system") == 0)
 		sprintf(fileio_command, "F%s,%" PRIx64 "/%" PRIx64, target->fileio_info->identifier,
 				target->fileio_info->param_1,
-				target->fileio_info->param_2);
+				target->fileio_info->param_2 + 1);	/* len + trailing zero */
 	else if (strcmp(target->fileio_info->identifier, "exit") == 0) {
 		/* If target hits exit syscall, report to GDB the program is terminated.
 		 * In addition, let target run its own exit syscall handler. */
diff --git a/src/target/nds32.c b/src/target/nds32.c
index 4115ea4f2..f40ce534b 100644
--- a/src/target/nds32.c
+++ b/src/target/nds32.c
@@ -2361,7 +2361,7 @@ int nds32_get_gdb_fileio_info(struct target *target, struct gdb_fileio_info *fil
 				fileio_info->param_4 = reg_r2;
 
 				target->type->read_buffer(target, reg_r0, 256, filename);
-				fileio_info->param_2 = strlen((char *)filename) + 1;
+				fileio_info->param_2 = strlen((char *)filename);
 			}
 			break;
 		case NDS32_SYSCALL_CLOSE:
@@ -2399,7 +2399,7 @@ int nds32_get_gdb_fileio_info(struct target *target, struct gdb_fileio_info *fil
 				/* reserve fileio_info->param_2 for length of path */
 
 				target->type->read_buffer(target, reg_r0, 256, filename);
-				fileio_info->param_2 = strlen((char *)filename) + 1;
+				fileio_info->param_2 = strlen((char *)filename);
 			}
 			break;
 		case NDS32_SYSCALL_RENAME:
@@ -2413,10 +2413,10 @@ int nds32_get_gdb_fileio_info(struct target *target, struct gdb_fileio_info *fil
 				/* reserve fileio_info->param_4 for length of new path */
 
 				target->type->read_buffer(target, reg_r0, 256, filename);
-				fileio_info->param_2 = strlen((char *)filename) + 1;
+				fileio_info->param_2 = strlen((char *)filename);
 
 				target->type->read_buffer(target, reg_r1, 256, filename);
-				fileio_info->param_4 = strlen((char *)filename) + 1;
+				fileio_info->param_4 = strlen((char *)filename);
 			}
 			break;
 		case NDS32_SYSCALL_FSTAT:
@@ -2458,7 +2458,7 @@ int nds32_get_gdb_fileio_info(struct target *target, struct gdb_fileio_info *fil
 				/* reserve fileio_info->param_2 for length of old path */
 
 				target->type->read_buffer(target, reg_r0, 256, command);
-				fileio_info->param_2 = strlen((char *)command) + 1;
+				fileio_info->param_2 = strlen((char *)command);
 			}
 			break;
 		case NDS32_SYSCALL_ERRNO: