]>
Commit | Line | Data |
---|---|---|
d2415672 AG |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.1.174 | |
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.174 | |
11 | Problem: Writing NUL past end of a buffer. | |
12 | Solution: Copy one byte less when using strncat(). (Dominuque Pelle) | |
13 | Files: src/ex_cmds.c, src/ex_docmd.c | |
14 | ||
15 | ||
16 | *** ../vim-7.1.173/src/ex_cmds.c Sat Dec 8 22:20:24 2007 | |
17 | --- src/ex_cmds.c Fri Dec 7 22:13:32 2007 | |
18 | *************** | |
19 | *** 1650,1656 **** | |
20 | { | |
21 | vim_snprintf((char *)IObuff, IOSIZE, _("%sviminfo: %s in line: "), | |
22 | errnum, message); | |
23 | ! STRNCAT(IObuff, line, IOSIZE - STRLEN(IObuff)); | |
24 | if (IObuff[STRLEN(IObuff) - 1] == '\n') | |
25 | IObuff[STRLEN(IObuff) - 1] = NUL; | |
26 | emsg(IObuff); | |
27 | --- 1650,1656 ---- | |
28 | { | |
29 | vim_snprintf((char *)IObuff, IOSIZE, _("%sviminfo: %s in line: "), | |
30 | errnum, message); | |
31 | ! STRNCAT(IObuff, line, IOSIZE - STRLEN(IObuff) - 1); | |
32 | if (IObuff[STRLEN(IObuff) - 1] == '\n') | |
33 | IObuff[STRLEN(IObuff) - 1] = NUL; | |
34 | emsg(IObuff); | |
35 | *** ../vim-7.1.173/src/ex_docmd.c Sat Nov 24 21:49:19 2007 | |
36 | --- src/ex_docmd.c Fri Dec 7 21:01:03 2007 | |
37 | *************** | |
38 | *** 2660,2666 **** | |
39 | errormsg = IObuff; | |
40 | } | |
41 | STRCAT(errormsg, ": "); | |
42 | ! STRNCAT(errormsg, *cmdlinep, IOSIZE - STRLEN(IObuff)); | |
43 | } | |
44 | emsg(errormsg); | |
45 | } | |
46 | --- 2660,2666 ---- | |
47 | errormsg = IObuff; | |
48 | } | |
49 | STRCAT(errormsg, ": "); | |
50 | ! STRNCAT(errormsg, *cmdlinep, IOSIZE - STRLEN(IObuff) - 1); | |
51 | } | |
52 | emsg(errormsg); | |
53 | } | |
54 | *** ../vim-7.1.173/src/version.c Sun Dec 9 19:25:35 2007 | |
55 | --- src/version.c Sun Dec 9 19:36:50 2007 | |
56 | *************** | |
57 | *** 668,669 **** | |
58 | --- 668,671 ---- | |
59 | { /* Add new patch number below this line */ | |
60 | + /**/ | |
61 | + 174, | |
62 | /**/ | |
63 | ||
64 | -- | |
65 | hundred-and-one symptoms of being an internet addict: | |
66 | 214. Your MCI "Circle of Friends" are all Hayes-compatible. | |
67 | ||
68 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
69 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
70 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
71 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |