2013-09-26 17:14:40 +02:00

27 lines
1.0 KiB
Plaintext

$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)");