From 9ecdba8b7d90c46123e9393e92da3d6eb415a980 Mon Sep 17 00:00:00 2001 From: he Date: Fri, 13 Apr 2018 16:59:13 +0000 Subject: Add a patch to main.c.in (and in the process rename the diff): Make a copy of the basename() result, so as to avoid a fortify abort due to overlapping memcpy() when the result from basename() is subsequently passed to basename(). Bump PKGREVISION. --- shells/rssh/patches/patch-ab | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 shells/rssh/patches/patch-ab (limited to 'shells/rssh/patches/patch-ab') diff --git a/shells/rssh/patches/patch-ab b/shells/rssh/patches/patch-ab deleted file mode 100644 index f50dc91434d..00000000000 --- a/shells/rssh/patches/patch-ab +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2010/10/16 09:57:39 adam Exp $ - ---- main.c.in.orig 2010-08-01 19:43:30.000000000 +0000 -+++ main.c.in -@@ -198,7 +198,7 @@ char **build_shell_args( struct passwd u - * build_arg_vector() in the chroot helper instead... - */ - -- if ( !(argvec = (char **)malloc(6 * sizeof (char *))) ){ -+ if ( !(argvec = (char **)malloc(4 * sizeof (char *))) ){ - log_set_priority(LOG_ERR); - log_msg("OOM error in build_shell_args() (fatal)"); - exit(1); -@@ -229,9 +229,9 @@ char **build_shell_args( struct passwd u - /* change the command to run to the chroot helper */ - *cmd = PATH_CHROOT_HELPER; - -- /* set up buffer to log command line ('"' + ' ' + '\0' = 9) */ -- len = strlen(cmdline) + strlen(argvec[2]) + -- strlen(PATH_CHROOT_HELPER) + 9; -+ /* set up buffer to log command line (argvec[1] + '"' + ' ' + '\0' = 6) */ -+ len = strlen(cmdline) + -+ strlen(PATH_CHROOT_HELPER) + 6; - if ( !(temp = (char *)malloc(len)) ){ - log_set_priority(LOG_ERR); - log_msg("OOM error in build_shell_args() (fatal)"); -- cgit v1.2.3