]>
Commit | Line | Data |
---|---|---|
d2415672 AG |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.1.171 | |
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.171 | |
11 | Problem: Reading one byte before allocated memory. | |
12 | Solution: Check index not to become negative. (Dominique Pelle) | |
13 | Files: src/ex_getln.c | |
14 | ||
15 | ||
16 | *** ../vim-7.1.170/src/ex_getln.c Tue Oct 30 17:36:31 2007 | |
17 | --- src/ex_getln.c Tue Dec 4 21:49:24 2007 | |
18 | *************** | |
19 | *** 1186,1195 **** | |
20 | case K_LEFT: | |
21 | case K_S_LEFT: | |
22 | case K_C_LEFT: | |
23 | do | |
24 | { | |
25 | - if (ccline.cmdpos == 0) | |
26 | - break; | |
27 | --ccline.cmdpos; | |
28 | #ifdef FEAT_MBYTE | |
29 | if (has_mbyte) /* move to first byte of char */ | |
30 | --- 1186,1195 ---- | |
31 | case K_LEFT: | |
32 | case K_S_LEFT: | |
33 | case K_C_LEFT: | |
34 | + if (ccline.cmdpos == 0) | |
35 | + goto cmdline_not_changed; | |
36 | do | |
37 | { | |
38 | --ccline.cmdpos; | |
39 | #ifdef FEAT_MBYTE | |
40 | if (has_mbyte) /* move to first byte of char */ | |
41 | *************** | |
42 | *** 1198,1204 **** | |
43 | #endif | |
44 | ccline.cmdspos -= cmdline_charsize(ccline.cmdpos); | |
45 | } | |
46 | ! while ((c == K_S_LEFT || c == K_C_LEFT | |
47 | || (mod_mask & (MOD_MASK_SHIFT|MOD_MASK_CTRL))) | |
48 | && ccline.cmdbuff[ccline.cmdpos - 1] != ' '); | |
49 | #ifdef FEAT_MBYTE | |
50 | --- 1198,1205 ---- | |
51 | #endif | |
52 | ccline.cmdspos -= cmdline_charsize(ccline.cmdpos); | |
53 | } | |
54 | ! while (ccline.cmdpos > 0 | |
55 | ! && (c == K_S_LEFT || c == K_C_LEFT | |
56 | || (mod_mask & (MOD_MASK_SHIFT|MOD_MASK_CTRL))) | |
57 | && ccline.cmdbuff[ccline.cmdpos - 1] != ' '); | |
58 | #ifdef FEAT_MBYTE | |
59 | *** ../vim-7.1.170/src/version.c Fri Dec 7 17:30:04 2007 | |
60 | --- src/version.c Fri Dec 7 20:00:06 2007 | |
61 | *************** | |
62 | *** 668,669 **** | |
63 | --- 668,671 ---- | |
64 | { /* Add new patch number below this line */ | |
65 | + /**/ | |
66 | + 171, | |
67 | /**/ | |
68 | ||
69 | -- | |
70 | Some of the well know MS-Windows errors: | |
71 | EMULTI Multitasking attempted, system confused | |
72 | EKEYBOARD Keyboard locked, try getting out of this one! | |
73 | EXPLAIN Unexplained error, please tell us what happened | |
74 | EFUTURE Reserved for our future mistakes | |
75 | ||
76 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
77 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
78 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
79 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |