CVS commit: src/crypto/external/bsd/openssh/dist

[Arnaud Ysmal]

Module Name:    src
Committed By:   stacktic
Date:           Tue Jun  9 13:32:46 UTC 2009

Modified Files:
        src/crypto/external/bsd/openssh/dist: scp.c sshconnect2.c

Log Message:
Fixed strvisx usage


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/scp.c \
    src/crypto/external/bsd/openssh/dist/sshconnect2.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/crypto/external/bsd/openssh/dist/scp.c
diff -u src/crypto/external/bsd/openssh/dist/scp.c:1.2 src/crypto/external/bsd/openssh/dist/scp.c:1.3
--- src/crypto/external/bsd/openssh/dist/scp.c:1.2	Sun Jun  7 22:38:47 2009
+++ src/crypto/external/bsd/openssh/dist/scp.c	Tue Jun  9 13:32:46 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: scp.c,v 1.2 2009/06/07 22:38:47 christos Exp $	*/
+/*	$NetBSD: scp.c,v 1.3 2009/06/09 13:32:46 stacktic Exp $	*/
 /* $OpenBSD: scp.c,v 1.164 2008/10/10 04:55:16 stevesk Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
@@ -73,7 +73,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: scp.c,v 1.2 2009/06/07 22:38:47 christos Exp $");
+__RCSID("$NetBSD: scp.c,v 1.3 2009/06/09 13:32:46 stacktic Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/poll.h>
@@ -630,7 +630,7 @@
 		if ((fd = open(name, O_RDONLY|O_NONBLOCK, 0)) < 0)
 			goto syserr;
 		if (strchr(name, '\n') != NULL) {
-			strvisx(encname, name, sizeof(encname), VIS_NL);
+			strvisx(encname, name, len, VIS_NL);
 			name = encname;
 		}
 		if (fstat(fd, &stb) < 0) {
Index: src/crypto/external/bsd/openssh/dist/sshconnect2.c
diff -u src/crypto/external/bsd/openssh/dist/sshconnect2.c:1.2 src/crypto/external/bsd/openssh/dist/sshconnect2.c:1.3
--- src/crypto/external/bsd/openssh/dist/sshconnect2.c:1.2	Sun Jun  7 22:38:47 2009
+++ src/crypto/external/bsd/openssh/dist/sshconnect2.c	Tue Jun  9 13:32:46 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: sshconnect2.c,v 1.2 2009/06/07 22:38:47 christos Exp $	*/
+/*	$NetBSD: sshconnect2.c,v 1.3 2009/06/09 13:32:46 stacktic Exp $	*/
 /* $OpenBSD: sshconnect2.c,v 1.170 2008/11/04 08:22:13 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: sshconnect2.c,v 1.2 2009/06/07 22:38:47 christos Exp $");
+__RCSID("$NetBSD: sshconnect2.c,v 1.3 2009/06/09 13:32:46 stacktic Exp $");
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
@@ -450,7 +450,7 @@
 		if (len > 65536)
 			len = 65536;
 		msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */
-		strvisx(msg, raw, len * 4 + 1, VIS_SAFE|VIS_OCTAL);
+		strvisx(msg, raw, len, VIS_SAFE|VIS_OCTAL);
 		fprintf(stderr, "%s", msg);
 		xfree(msg);
 	}