Attachment 3447 Details for Bug 3206 – Use long long for chown uid

[patch] Use long long for chown uid

sftp-chown-longlong.patch (text/plain), 1.13 KB, created by Darren Tucker on 2020-10-02 15:16:28 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2020-10-02 15:16:28 AEST

Size: 1.13 KB

patch

obsolete

>Index: sftp.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/sftp.c,v
>retrieving revision 1.201
>diff -u -p -r1.201 sftp.c
>--- sftp.c	3 Aug 2020 02:43:41 -0000	1.201
>+++ sftp.c	2 Oct 2020 05:10:05 -0000
>@@ -1302,7 +1302,7 @@ parse_args(const char **cpp, int *ignore
> 	const char *cmd, *cp = *cpp;
> 	char *cp2, **argv;
> 	int base = 0;
>-	long l;
>+	long long ll;
> 	int path1_mandatory = 0, i, cmdnum, optidx, argc;
> 
> 	/* Skip leading whitespace */
>@@ -1460,16 +1460,16 @@ parse_args(const char **cpp, int *ignore
> 		if (argc - optidx < 1)
> 			goto need_num_arg;
> 		errno = 0;
>-		l = strtol(argv[optidx], &cp2, base);
>+		ll = strtoll(argv[optidx], &cp2, base);
> 		if (cp2 == argv[optidx] || *cp2 != '\0' ||
>-		    ((l == LONG_MIN || l == LONG_MAX) && errno == ERANGE) ||
>-		    l < 0) {
>+		    ((ll == LLONG_MIN || ll == LLONG_MAX) && errno == ERANGE) ||
>+		    ll < 0 || ll > UINT32_MAX) {
>  need_num_arg:
> 			error("You must supply a numeric argument "
> 			    "to the %s command.", cmd);
> 			return -1;
> 		}
>-		*n_arg = l;
>+		*n_arg = ll;
> 		if (cmdnum == I_LUMASK)
> 			break;
> 		/* Get pathname (mandatory) */

Actions: View | Diff

Attachments on bug 3206: 3447