diff options
author | Damien Miller <djm@mindrot.org> | 2014-05-15 14:25:18 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-05-15 14:25:18 +1000 |
commit | 380948180f847a26f2d0c85b4dad3dca2ed2fd8b (patch) | |
tree | 0742e7603e78620286743bf96e0a7836500663b1 /sftp.c | |
parent | d7fd8bedd4619a2ec7fd02aae4c4e1db4431ad9f (diff) |
- dtucker@cvs.openbsd.org 2014/04/29 20:36:51
[sftp.c]
Don't attempt to append a nul quote char to the filename. Should prevent
fatal'ing with "el_insertstr failed" when there's a single quote char
somewhere in the string. bz#2238, ok markus@
Diffstat (limited to 'sftp.c')
-rw-r--r-- | sftp.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp.c,v 1.161 2014/04/29 19:58:50 dtucker Exp $ */ | 1 | /* $OpenBSD: sftp.c,v 1.162 2014/04/29 20:36:51 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -1912,7 +1912,7 @@ complete_match(EditLine *el, struct sftp_conn *conn, char *remote_path, | |||
1912 | lf = el_line(el); | 1912 | lf = el_line(el); |
1913 | if (g.gl_matchc == 1) { | 1913 | if (g.gl_matchc == 1) { |
1914 | i = 0; | 1914 | i = 0; |
1915 | if (!terminated) | 1915 | if (!terminated && quote != '\0') |
1916 | ins[i++] = quote; | 1916 | ins[i++] = quote; |
1917 | if (*(lf->cursor - 1) != '/' && | 1917 | if (*(lf->cursor - 1) != '/' && |
1918 | (lastarg || *(lf->cursor) != ' ')) | 1918 | (lastarg || *(lf->cursor) != ' ')) |