[openssh-commits] [openssh] 01/02: upstream: backout r1.243 (fix for fatal during tab-completion with

git+noreply at mindrot.org git+noreply at mindrot.org
Thu Oct 2 19:04:57 AEST 2025


This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 6a239b057be2897d7a597daaf5394f2e7312dc65
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Thu Oct 2 04:23:11 2025 +0000

    upstream: backout r1.243 (fix for fatal during tab-completion with
    
    some multibyte sequences) as it breaks the common case for tab completion.
    
    Will deal with it properly after release.
    
    OpenBSD-Commit-ID: 196d00f5ff19579214de45357f16a1fb2d624be1
---
 sftp.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/sftp.c b/sftp.c
index bdcf97708..3b505eea2 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.244 2025/09/30 00:06:06 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.245 2025/10/02 04:23:11 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm at openbsd.org>
  *
@@ -1868,7 +1868,6 @@ complete_ambiguous(const char *word, char **list, size_t count)
 
 	if (count > 0) {
 		u_int y, matchlen = strlen(list[0]);
-		u_int itemlen = matchlen, wordlen = strlen(word);
 
 		/* Find length of common stem */
 		for (y = 1; list[y]; y++) {
@@ -1881,10 +1880,6 @@ complete_ambiguous(const char *word, char **list, size_t count)
 			matchlen = x;
 		}
 
-		for (; matchlen > wordlen; matchlen--)
-			if (mblen(list[0] + matchlen, itemlen - matchlen) >= 0)
-				break;
-
 		if (matchlen > strlen(word)) {
 			char *tmp = xstrdup(list[0]);
 

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list