aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/regexp_defs.h
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-07-24 22:57:15 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-08-02 12:00:01 -0400
commit1ab1de78450ba656e4127a22fd7cf58f86754518 (patch)
tree4a585939bfa06402c7ad5d05c0c698db687eac0f /src/nvim/regexp_defs.h
parentf3964c170e9719af26d00b82e10be37a80693d15 (diff)
downloadrneovim-1ab1de78450ba656e4127a22fd7cf58f86754518.tar.gz
rneovim-1ab1de78450ba656e4127a22fd7cf58f86754518.tar.bz2
rneovim-1ab1de78450ba656e4127a22fd7cf58f86754518.zip
vim-patch:8.1.0192: executing regexp recursively fails with a crash
Problem: Executing regexp recursively fails with a crash. Solution: Move global variables into "rex". https://github.com/vim/vim/commit/0270f38e1ae484c31a80c813a08691c47a207f1a
Diffstat (limited to 'src/nvim/regexp_defs.h')
-rw-r--r--src/nvim/regexp_defs.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/regexp_defs.h b/src/nvim/regexp_defs.h
index 116bfee91e..a729a91555 100644
--- a/src/nvim/regexp_defs.h
+++ b/src/nvim/regexp_defs.h
@@ -72,6 +72,7 @@ struct regprog {
unsigned regflags;
unsigned re_engine; ///< Automatic, backtracking or NFA engine.
unsigned re_flags; ///< Second argument for vim_regcomp().
+ bool re_in_use; ///< prog is being executed
};
/*
@@ -84,7 +85,8 @@ typedef struct {
regengine_T *engine;
unsigned regflags;
unsigned re_engine;
- unsigned re_flags; ///< Second argument for vim_regcomp().
+ unsigned re_flags;
+ bool re_in_use;
int regstart;
char_u reganch;
@@ -114,7 +116,8 @@ typedef struct {
regengine_T *engine;
unsigned regflags;
unsigned re_engine;
- unsigned re_flags; ///< Second argument for vim_regcomp().
+ unsigned re_flags;
+ bool re_in_use;
nfa_state_T *start; // points into state[]