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 | |
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@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sftp.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -47,6 +47,11 @@ - dtucker@cvs.openbsd.org 2014/04/29 19:58:50 [sftp.c] Move nulling of variable next to where it's freed. ok markus@ + - 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@ 20140430 - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.161 2014/04/29 19:58:50 dtucker Exp $ */ +/* $OpenBSD: sftp.c,v 1.162 2014/04/29 20:36:51 dtucker Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -1912,7 +1912,7 @@ complete_match(EditLine *el, struct sftp_conn *conn, char *remote_path, lf = el_line(el); if (g.gl_matchc == 1) { i = 0; - if (!terminated) + if (!terminated && quote != '\0') ins[i++] = quote; if (*(lf->cursor - 1) != '/' && (lastarg || *(lf->cursor) != ' ')) |