]>
Commit | Line | Data |
---|---|---|
0a7814d6 AG |
1 | To: vim-dev@vim.org |
2 | Subject: patch 7.1.096 | |
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.096 | |
11 | Problem: Reading past end of a string when resizing Vim. (Dominique Pelle) | |
12 | Solution: Check the string pointer before getting the char it points to. | |
13 | Files: src/message.c | |
14 | ||
15 | ||
16 | *** ../vim-7.1.095/src/message.c Tue Aug 7 21:59:26 2007 | |
17 | --- src/message.c Thu Aug 30 22:53:03 2007 | |
18 | *************** | |
19 | *** 944,949 **** | |
20 | --- 944,950 ---- | |
21 | c = K_IGNORE; | |
22 | } | |
23 | #endif | |
24 | + | |
25 | /* | |
26 | * Allow scrolling back in the messages. | |
27 | * Also accept scroll-down commands when messages fill the screen, | |
28 | *************** | |
29 | *** 1840,1845 **** | |
30 | --- 1841,1847 ---- | |
31 | char_u *sb_str = str; | |
32 | int sb_col = msg_col; | |
33 | int wrap; | |
34 | + int did_last_char; | |
35 | ||
36 | did_wait_return = FALSE; | |
37 | while ((maxlen < 0 || (int)(s - str) < maxlen) && *s != NUL) | |
38 | *************** | |
39 | *** 1909,1915 **** | |
40 | --- 1911,1920 ---- | |
41 | else | |
42 | #endif | |
43 | msg_screen_putchar(*s++, attr); | |
44 | + did_last_char = TRUE; | |
45 | } | |
46 | + else | |
47 | + did_last_char = FALSE; | |
48 | ||
49 | if (p_more) | |
50 | /* store text for scrolling back */ | |
51 | *************** | |
52 | *** 1944,1954 **** | |
53 | ||
54 | /* When we displayed a char in last column need to check if there | |
55 | * is still more. */ | |
56 | ! if (*s >= ' ' | |
57 | ! #ifdef FEAT_RIGHTLEFT | |
58 | ! && !cmdmsg_rl | |
59 | ! #endif | |
60 | ! ) | |
61 | continue; | |
62 | } | |
63 | ||
64 | --- 1949,1955 ---- | |
65 | ||
66 | /* When we displayed a char in last column need to check if there | |
67 | * is still more. */ | |
68 | ! if (did_last_char) | |
69 | continue; | |
70 | } | |
71 | ||
72 | *** ../vim-7.1.095/src/version.c Wed Sep 5 21:45:54 2007 | |
73 | --- src/version.c Thu Sep 6 12:31:28 2007 | |
74 | *************** | |
75 | *** 668,669 **** | |
76 | --- 668,671 ---- | |
77 | { /* Add new patch number below this line */ | |
78 | + /**/ | |
79 | + 96, | |
80 | /**/ | |
81 | ||
82 | -- | |
83 | Yah, well, we had to carve our electrons out of driftwood we'd | |
84 | find. In the winter. Uphill. Both ways. | |
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 /// |