tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: Fix two problems in string->argv conversion: 1) multiple 

backslashes were not being dequoted correctly and 2) quoted space in the
middle of a string was being incorrectly split.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A unit test for these cases has already been committed

prompted by and based on GHPR#223 by Eero Häkkinen; ok markus@

OpenBSD-Commit-ID: d7ef27abb4eeeaf6e167e9312e4abe9e89faf1e4
This commit is contained in:
djm@openbsd.org 2021-04-03 05:21:46 +00:00 committed by Damien Miller
parent f75bcbba58
commit dc3c0be820
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
misc.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: misc.c,v 1.162 2021/02/28 01:50:47 dtucker Exp $ */ /* $OpenBSD: misc.c,v 1.163 2021/04/03 05:21:46 djm Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2005-2020 Damien Miller. All rights reserved. * Copyright (c) 2005-2020 Damien Miller. All rights reserved.
@ -1935,11 +1935,6 @@ argv_split(const char *s, int *argcp, char ***argvp)
/* Start of a token */ /* Start of a token */
quote = 0; quote = 0;
if (s[i] == '\\' &&
(s[i + 1] == '\'' || s[i + 1] == '\"' || s[i + 1] == '\\'))
i++;
else if (s[i] == '\'' || s[i] == '"')
quote = s[i++];
argv = xreallocarray(argv, (argc + 2), sizeof(*argv)); argv = xreallocarray(argv, (argc + 2), sizeof(*argv));
arg = argv[argc++] = xcalloc(1, strlen(s + i) + 1); arg = argv[argc++] = xcalloc(1, strlen(s + i) + 1);
@ -1959,8 +1954,10 @@ argv_split(const char *s, int *argcp, char ***argvp)
} }
} else if (quote == 0 && (s[i] == ' ' || s[i] == '\t')) } else if (quote == 0 && (s[i] == ' ' || s[i] == '\t'))
break; /* done */ break; /* done */
else if (quote == 0 && (s[i] == '\"' || s[i] == '\''))
quote = s[i]; /* quote start */
else if (quote != 0 && s[i] == quote) else if (quote != 0 && s[i] == quote)
break; /* done */ quote = 0; /* quote end */
else else
arg[j++] = s[i]; arg[j++] = s[i];
} }