Attachment 1040 Details for Bug 482 – Same again with (hopefully) less bugs.

[patch] Same again with (hopefully) less bugs.

openssh-token-escape.patch (text/plain), 1.03 KB, created by Darren Tucker on 2005-12-13 23:15:53 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2005-12-13 23:15:53 AEDT

Size: 1.03 KB

patch

obsolete

>Index: misc.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/misc.c,v
>retrieving revision 1.53
>diff -u -p -r1.53 misc.c
>--- misc.c	13 Dec 2005 09:44:13 -0000	1.53
>+++ misc.c	13 Dec 2005 12:13:38 -0000
>@@ -125,22 +125,32 @@ char *
> strdelim(char **s)
> {
> 	char *old;
>-	int wspace = 0;
>+	int cont, wspace = 0;
> 
> 	if (*s == NULL)
> 		return NULL;
> 
> 	old = *s;
> 
>-	*s = strpbrk(*s, WHITESPACE "=");
>-	if (*s == NULL)
>-		return (old);
>+	do {
>+		cont = 0;
>+		*s = strpbrk(*s, WHITESPACE "=\\");
>+		if (*s == NULL)
>+			return (old);
>+		/* If we found a backslash, remove it and skip next char */
>+		if (*s[0] == '\\') {
>+			cont = 1;
>+			memmove(*s, *s + 1, strlen(*s)); /* move nul too */
>+			*s++;
>+		}
>+	} while (cont);
> 
> 	/* Allow only one '=' to be skipped */
> 	if (*s[0] == '=')
> 		wspace = 1;
> 	*s[0] = '\0';
> 
>+	/* Skip any extra whitespace after first token */
> 	*s += strspn(*s + 1, WHITESPACE) + 1;
> 	if (*s[0] == '=' && !wspace)
> 		*s += strspn(*s + 1, WHITESPACE) + 1;

Actions: View | Diff

Attachments on bug 482: 1038 | 1039 | 1040 | 1041 | 1084