summaryrefslogtreecommitdiff
path: root/src/regexp_nfa.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-06-05 16:33:10 +0200
committerBram Moolenaar <Bram@vim.org>2013-06-05 16:33:10 +0200
commit5b84ddcceae72c14c3f608006d305f9a8e00fefc (patch)
tree5285a074362c8cb4ffbd87ca57af59c52a0a37c0 /src/regexp_nfa.c
parent1cd3f2c4507ad242a6ed50270009f19fa49e5a7b (diff)
downloadvim-git-5b84ddcceae72c14c3f608006d305f9a8e00fefc.tar.gz
updated for version 7.3.1120v7.3.1120
Problem: Crash when regexp logging is enabled. Solution: Avoid using NULL pointers. Advance over count argument.
Diffstat (limited to 'src/regexp_nfa.c')
-rw-r--r--src/regexp_nfa.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 4dea47c77..5873cfcc1 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -2960,10 +2960,15 @@ log_subexpr(sub)
sub->list.multi[j].end.col,
(int)sub->list.multi[j].end.lnum);
else
+ {
+ char *s = (char *)sub->list.line[j].start;
+ char *e = (char *)sub->list.line[j].end;
+
fprintf(log_fd, "\n *** group %d, start: \"%s\", end: \"%s\"",
j,
- (char *)sub->list.line[j].start,
- (char *)sub->list.line[j].end);
+ s == NULL ? "NULL" : s,
+ e == NULL ? "NULL" : e);
+ }
fprintf(log_fd, "\n");
}
#endif