projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 25f687b8 AM |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.1.143 | |
| 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.143 | |
| 11 | Problem: Uninitialized memory read when diffing three files. (Dominique | |
| 12 | Pelle) | |
| 13 | Solution: Remove "+ !notset" so that we don't use fields that were not | |
| 14 | computed. | |
| 15 | Files: src/diff.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.1.142/src/diff.c Sat Sep 29 14:15:00 2007 | |
| 19 | --- src/diff.c Sun Oct 14 21:52:56 2007 | |
| 20 | *************** | |
| 21 | *** 1310,1316 **** | |
| 22 | dp->df_count[idx_new] += -off; | |
| 23 | off = 0; | |
| 24 | } | |
| 25 | ! for (i = idx_orig; i < idx_new + !notset; ++i) | |
| 26 | if (curtab->tp_diffbuf[i] != NULL) | |
| 27 | dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i] | |
| 28 | - dp->df_lnum[i] + off; | |
| 29 | --- 1310,1316 ---- | |
| 30 | dp->df_count[idx_new] += -off; | |
| 31 | off = 0; | |
| 32 | } | |
| 33 | ! for (i = idx_orig; i < idx_new; ++i) | |
| 34 | if (curtab->tp_diffbuf[i] != NULL) | |
| 35 | dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i] | |
| 36 | - dp->df_lnum[i] + off; | |
| 37 | *** ../vim-7.1.142/src/version.c Fri Oct 19 16:20:09 2007 | |
| 38 | --- src/version.c Fri Oct 19 17:32:18 2007 | |
| 39 | *************** | |
| 40 | *** 668,669 **** | |
| 41 | --- 668,671 ---- | |
| 42 | { /* Add new patch number below this line */ | |
| 43 | + /**/ | |
| 44 | + 143, | |
| 45 | /**/ | |
| 46 | ||
| 47 | -- | |
| 48 | hundred-and-one symptoms of being an internet addict: | |
| 49 | 37. You start looking for hot HTML addresses in public restrooms. | |
| 50 | ||
| 51 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 52 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 53 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 54 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |