From 357d9256d65bca54c7ef3fd1d2d9038100ae3944 Mon Sep 17 00:00:00 2001 From: crc Date: Fri, 11 Jan 2019 03:17:21 +0000 Subject: [PATCH] i/o devices: use strlcpy instead of strcpy FossilOrigin-Name: fcd8cd5bee462dcd652328e689afa92f312b71b3d259fdb69739865c8ae99e44 --- interfaces/io_gopher.c | 4 ++-- interfaces/io_unix_syscalls.c | 34 +++++++++++++++++----------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/interfaces/io_gopher.c b/interfaces/io_gopher.c index 197b6c4..e879133 100644 --- a/interfaces/io_gopher.c +++ b/interfaces/io_gopher.c @@ -134,9 +134,9 @@ void gopher_fetch(char *host, CELL port, char *selector, CELL dest) { void ngaGopherUnit() { CELL port, dest; char server[1025], selector[4097]; - strcpy(selector, string_extract(stack_pop())); + strlcpy(selector, string_extract(stack_pop()), 4096); port = stack_pop(); - strcpy(server, string_extract(stack_pop())); + strlcpy(server, string_extract(stack_pop()), 1024); dest = stack_pop(); gopher_fetch(server, port, selector, dest); } diff --git a/interfaces/io_unix_syscalls.c b/interfaces/io_unix_syscalls.c index 847f1f6..d49dea3 100644 --- a/interfaces/io_unix_syscalls.c +++ b/interfaces/io_unix_syscalls.c @@ -139,38 +139,38 @@ void unix_fork() { ---------------------------------------------------------------------*/ void unix_exec0() { - char path[1024]; - strcpy(path, string_extract(stack_pop())); + char path[1025]; + strlcpy(path, string_extract(stack_pop()), 1024); execl(path, path, (char *)0); stack_push(errno); } void unix_exec1() { - char path[1024]; - char arg0[1024]; - strcpy(arg0, string_extract(stack_pop())); - strcpy(path, string_extract(stack_pop())); + char path[1025]; + char arg0[1025]; + strlcpy(arg0, string_extract(stack_pop()), 1024); + strlcpy(path, string_extract(stack_pop()), 1024); execl(path, path, arg0, (char *)0); stack_push(errno); } void unix_exec2() { - char path[1024]; - char arg0[1024], arg1[1024]; - strcpy(arg1, string_extract(stack_pop())); - strcpy(arg0, string_extract(stack_pop())); - strcpy(path, string_extract(stack_pop())); + char path[1025]; + char arg0[1025], arg1[1025]; + strlcpy(arg1, string_extract(stack_pop()), 1024); + strlcpy(arg0, string_extract(stack_pop()), 1024); + strlcpy(path, string_extract(stack_pop()), 1024); execl(path, path, arg0, arg1, (char *)0); stack_push(errno); } void unix_exec3() { - char path[1024]; - char arg0[1024], arg1[1024], arg2[1024]; - strcpy(arg2, string_extract(stack_pop())); - strcpy(arg1, string_extract(stack_pop())); - strcpy(arg0, string_extract(stack_pop())); - strcpy(path, string_extract(stack_pop())); + char path[1025]; + char arg0[1025], arg1[1025], arg2[1025]; + strlcpy(arg2, string_extract(stack_pop()), 1024); + strlcpy(arg1, string_extract(stack_pop()), 1024); + strlcpy(arg0, string_extract(stack_pop()), 1024); + strlcpy(path, string_extract(stack_pop()), 1024); execl(path, path, arg0, arg1, arg2, (char *)0); stack_push(errno); }