|
 |
4ac89d5 |
To: vim-dev@vim.org
|
|
|
4ac89d5 |
Subject: Patch 7.1.143
|
|
|
4ac89d5 |
Fcc: outbox
|
|
|
4ac89d5 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
4ac89d5 |
Mime-Version: 1.0
|
|
|
4ac89d5 |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
4ac89d5 |
Content-Transfer-Encoding: 8bit
|
|
|
4ac89d5 |
------------
|
|
|
4ac89d5 |
|
|
|
4ac89d5 |
Patch 7.1.143
|
|
|
4ac89d5 |
Problem: Uninitialized memory read when diffing three files. (Dominique
|
|
|
4ac89d5 |
Pelle)
|
|
|
4ac89d5 |
Solution: Remove "+ !notset" so that we don't use fields that were not
|
|
|
4ac89d5 |
computed.
|
|
|
4ac89d5 |
Files: src/diff.c
|
|
|
4ac89d5 |
|
|
|
4ac89d5 |
|
|
|
4ac89d5 |
*** ../vim-7.1.142/src/diff.c Sat Sep 29 14:15:00 2007
|
|
|
4ac89d5 |
--- src/diff.c Sun Oct 14 21:52:56 2007
|
|
|
4ac89d5 |
***************
|
|
|
4ac89d5 |
*** 1310,1316 ****
|
|
|
4ac89d5 |
dp->df_count[idx_new] += -off;
|
|
|
4ac89d5 |
off = 0;
|
|
|
4ac89d5 |
}
|
|
|
4ac89d5 |
! for (i = idx_orig; i < idx_new + !notset; ++i)
|
|
|
4ac89d5 |
if (curtab->tp_diffbuf[i] != NULL)
|
|
|
4ac89d5 |
dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i]
|
|
|
4ac89d5 |
- dp->df_lnum[i] + off;
|
|
|
4ac89d5 |
--- 1310,1316 ----
|
|
|
4ac89d5 |
dp->df_count[idx_new] += -off;
|
|
|
4ac89d5 |
off = 0;
|
|
|
4ac89d5 |
}
|
|
|
4ac89d5 |
! for (i = idx_orig; i < idx_new; ++i)
|
|
|
4ac89d5 |
if (curtab->tp_diffbuf[i] != NULL)
|
|
|
4ac89d5 |
dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i]
|
|
|
4ac89d5 |
- dp->df_lnum[i] + off;
|
|
|
4ac89d5 |
*** ../vim-7.1.142/src/version.c Fri Oct 19 16:20:09 2007
|
|
|
4ac89d5 |
--- src/version.c Fri Oct 19 17:32:18 2007
|
|
|
4ac89d5 |
***************
|
|
|
4ac89d5 |
*** 668,669 ****
|
|
|
4ac89d5 |
--- 668,671 ----
|
|
|
4ac89d5 |
{ /* Add new patch number below this line */
|
|
|
4ac89d5 |
+ /**/
|
|
|
4ac89d5 |
+ 143,
|
|
|
4ac89d5 |
/**/
|
|
|
4ac89d5 |
|
|
|
4ac89d5 |
--
|
|
|
4ac89d5 |
hundred-and-one symptoms of being an internet addict:
|
|
|
4ac89d5 |
37. You start looking for hot HTML addresses in public restrooms.
|
|
|
4ac89d5 |
|
|
|
4ac89d5 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
4ac89d5 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
4ac89d5 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
4ac89d5 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|