| 6577e359 |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.1.052 |
| 3 | Fcc: outbox |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> |
| 5 | Mime-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | ------------ |
| 9 | |
| 10 | Patch 7.1.052 |
| 11 | Problem: When creating a new match not all fields are initialized, which |
| 12 | may lead to unpredictable results. |
| 13 | Solution: Initialise rmm_ic and rmm_maxcol. |
| 14 | Files: src/window.c |
| 15 | |
| 16 | |
| 17 | *** ../vim-7.1.051/src/window.c Thu Jul 26 22:55:11 2007 |
| 18 | --- src/window.c Sun Aug 5 17:17:51 2007 |
| 19 | *************** |
| 20 | *** 6200,6206 **** |
| 21 | matchitem_T *prev; |
| 22 | matchitem_T *m; |
| 23 | int hlg_id; |
| 24 | ! regmmatch_T match; |
| 25 | |
| 26 | if (*grp == NUL || *pat == NUL) |
| 27 | return -1; |
| 28 | --- 6243,6249 ---- |
| 29 | matchitem_T *prev; |
| 30 | matchitem_T *m; |
| 31 | int hlg_id; |
| 32 | ! regprog_T *regprog; |
| 33 | |
| 34 | if (*grp == NUL || *pat == NUL) |
| 35 | return -1; |
| 36 | *************** |
| 37 | *** 6227,6233 **** |
| 38 | EMSG2(_(e_nogroup), grp); |
| 39 | return -1; |
| 40 | } |
| 41 | ! if ((match.regprog = vim_regcomp(pat, RE_MAGIC)) == NULL) |
| 42 | { |
| 43 | EMSG2(_(e_invarg2), pat); |
| 44 | return -1; |
| 45 | --- 6270,6276 ---- |
| 46 | EMSG2(_(e_nogroup), grp); |
| 47 | return -1; |
| 48 | } |
| 49 | ! if ((regprog = vim_regcomp(pat, RE_MAGIC)) == NULL) |
| 50 | { |
| 51 | EMSG2(_(e_invarg2), pat); |
| 52 | return -1; |
| 53 | *************** |
| 54 | *** 6250,6256 **** |
| 55 | m->priority = prio; |
| 56 | m->pattern = vim_strsave(pat); |
| 57 | m->hlg_id = hlg_id; |
| 58 | ! m->match.regprog = match.regprog; |
| 59 | |
| 60 | /* Insert new match. The match list is in ascending order with regard to |
| 61 | * the match priorities. */ |
| 62 | --- 6293,6301 ---- |
| 63 | m->priority = prio; |
| 64 | m->pattern = vim_strsave(pat); |
| 65 | m->hlg_id = hlg_id; |
| 66 | ! m->match.regprog = regprog; |
| 67 | ! m->match.rmm_ic = FALSE; |
| 68 | ! m->match.rmm_maxcol = 0; |
| 69 | |
| 70 | /* Insert new match. The match list is in ascending order with regard to |
| 71 | * the match priorities. */ |
| 72 | *** ../vim-7.1.051/src/version.c Sun Aug 5 18:32:21 2007 |
| 73 | --- src/version.c Sun Aug 5 18:47:55 2007 |
| 74 | *************** |
| 75 | *** 668,669 **** |
| 76 | --- 668,671 ---- |
| 77 | { /* Add new patch number below this line */ |
| 78 | + /**/ |
| 79 | + 52, |
| 80 | /**/ |
| 81 | |
| 82 | -- |
| 83 | From "know your smileys": |
| 84 | 8-O "Omigod!!" (done "rm -rf *" ?) |
| 85 | |
| 86 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ |
| 87 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
| 88 | \\\ download, build and distribute -- http://www.A-A-P.org /// |
| 89 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |
projects / packages / vim.git / blame