4 From: Bram Moolenaar <Bram@moolenaar.net>
6 Content-Type: text/plain; charset=ISO-8859-1
7 Content-Transfer-Encoding: 8bit
11 Problem: May compare two unrelated pointers when matching a pattern against
12 a string. (Dominique Pelle)
13 Solution: Avoid calling reg_getline() when REG_MULTI is false.
17 *** ../vim-7.0.143/src/regexp.c Tue Aug 29 17:28:56 2006
18 --- src/regexp.c Tue Oct 17 18:30:18 2006
23 /* Check for character class with NL added. */
24 ! if (!reg_line_lbr && WITH_NL(op) && *reginput == NUL
25 ! && reglnum <= reg_maxline)
32 /* Check for character class with NL added. */
33 ! if (!reg_line_lbr && WITH_NL(op) && REG_MULTI
34 ! && *reginput == NUL && reglnum <= reg_maxline)
43 ! if ((c != NUL || reglnum > reg_maxline || reg_line_lbr)
44 ! && (c != '\n' || !reg_line_lbr))
46 else if (reg_line_lbr)
52 ! if ((c != NUL || !REG_MULTI || reglnum > reg_maxline
53 ! || reg_line_lbr) && (c != '\n' || !reg_line_lbr))
55 else if (reg_line_lbr)
62 ! if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr
63 ! || count == maxcount)
65 ++count; /* count the line-break */
71 ! if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline
72 ! || reg_line_lbr || count == maxcount)
74 ++count; /* count the line-break */
79 else if (*scan == NUL)
81 ! if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr)
87 else if (*scan == NUL)
89 ! if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline
97 else if (*scan == NUL)
99 ! if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr)
105 else if (*scan == NUL)
107 ! if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline
115 else if (*scan == NUL)
117 ! if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr)
123 else if (*scan == NUL)
125 ! if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline
135 ! if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr)
143 ! if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline
153 ! if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr)
161 ! if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline
171 ! if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr)
179 ! if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline
188 while (count < maxcount
189 ! && ((*scan == NUL && reglnum <= reg_maxline && !reg_line_lbr)
190 ! || (*scan == '\n' && reg_line_lbr)))
197 while (count < maxcount
198 ! && ((*scan == NUL && reglnum <= reg_maxline && !reg_line_lbr
199 ! && REG_MULTI) || (*scan == '\n' && reg_line_lbr)))
203 *** ../vim-7.0.143/src/version.c Tue Oct 17 18:36:03 2006
204 --- src/version.c Tue Oct 17 18:48:51 2006
208 { /* Add new patch number below this line */
214 Be thankful to be in a traffic jam, because it means you own a car.
216 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
217 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
218 \\\ download, build and distribute -- http://www.A-A-P.org ///
219 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///