Commit: patch 9.1.0702: Patch 9.1.0700 broke CI

9 views
Skip to first unread message

Christian Brabandt

unread,
Aug 28, 2024, 6:00:16 PM8/28/24
to vim...@googlegroups.com
patch 9.1.0702: Patch 9.1.0700 broke CI

Commit: https://github.com/vim/vim/commit/f459d68ecfe40875da863bee100c45cb80e19b87
Author: Christian Brabandt <c...@256bit.org>
Date: Wed Aug 28 23:46:53 2024 +0200

patch 9.1.0702: Patch 9.1.0700 broke CI

Problem: Patch 9.1.0700 broke CI
Solution: Revert for now

Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/fileio.c b/src/fileio.c
index 890eac785..d27a1727e 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5714,8 +5714,7 @@ file_pat_to_reg_pat(
)
*allow_dirs = TRUE;
reg_pat[i++] = '\';
- if (enc_dbcs != 0 && (*mb_ptr2len)(p) > 1)
- reg_pat[i++] = *p++;
+ reg_pat[i++] = *p;
}
break;
#ifdef BACKSLASH_IN_FILENAME
diff --git a/src/testdir/test_crash.vim b/src/testdir/test_crash.vim
index bfd04ff10..d6975931b 100644
--- a/src/testdir/test_crash.vim
+++ b/src/testdir/test_crash.vim
@@ -222,11 +222,11 @@ func Test_crash1_3()
call term_sendkeys(buf, args)
call TermWait(buf, 150)

- let file = 'crash/heap_overflow_glob2regpat'
- let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'"
- let args = printf(cmn_args, vim, file)
- call term_sendkeys(buf, args)
- call TermWait(buf, 50)
+ " let file = 'crash/heap_overflow_glob2regpat'
+ " let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'"
+ " let args = printf(cmn_args, vim, file)
+ " call term_sendkeys(buf, args)
+ " call TermWait(buf, 50)

let file = 'crash/nullptr_regexp_nfa'
let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'"
diff --git a/src/version.c b/src/version.c
index 5dfb313d2..c3e510a92 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 702,
/**/
701,
/**/
Reply all
Reply to author
Forward
0 new messages