RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-11 20:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
Properly handle invalid %-format by calling fatal.

ok deraadt, djm

Upstream-ID: 5692bce7d9f6eaa9c488cb93d3b55e758bef1eac
This commit is contained in:
tobias@openbsd.org 2015-12-04 21:51:06 +00:00 committed by Damien Miller
parent 76c9fbbe35
commit 8b56e59714
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: misc.c,v 1.99 2015/10/24 08:34:09 sthen Exp $ */ /* $OpenBSD: misc.c,v 1.100 2015/12/04 21:51:06 tobias Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2005,2006 Damien Miller. All rights reserved. * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@ -604,6 +604,8 @@ percent_expand(const char *string, ...)
/* %% case */ /* %% case */
if (*string == '%') if (*string == '%')
goto append; goto append;
if (*string == '\0')
fatal("%s: invalid format", __func__);
for (j = 0; j < num_keys; j++) { for (j = 0; j < num_keys; j++) {
if (strchr(keys[j].key, *string) != NULL) { if (strchr(keys[j].key, *string) != NULL) {
i = strlcat(buf, keys[j].repl, sizeof(buf)); i = strlcat(buf, keys[j].repl, sizeof(buf));