1 To: [email protected] |
|
2 Subject: Patch 7.2.038 |
|
3 Fcc: outbox |
|
4 From: Bram Moolenaar <[email protected]> |
|
5 Mime-Version: 1.0 |
|
6 Content-Type: text/plain; charset=ISO-8859-1 |
|
7 Content-Transfer-Encoding: 8bit |
|
8 ------------ |
|
9 |
|
10 Patch 7.2.038 |
|
11 Problem: Overlapping arguments to memcpy(). |
|
12 Solution: Use mch_memmove(). (Dominique Pelle) |
|
13 Files: src/if_xcmdsrv.c |
|
14 |
|
15 |
|
16 *** ../vim-7.2.037/src/if_xcmdsrv.c Wed Aug 6 18:38:13 2008 |
|
17 --- src/if_xcmdsrv.c Wed Nov 12 12:09:01 2008 |
|
18 *************** |
|
19 *** 736,742 **** |
|
20 + serverReply.ga_len; |
|
21 e.id = w; |
|
22 ga_init2(&e.strings, 1, 100); |
|
23 ! memcpy(p, &e, sizeof(e)); |
|
24 serverReply.ga_len++; |
|
25 } |
|
26 } |
|
27 --- 736,742 ---- |
|
28 + serverReply.ga_len; |
|
29 e.id = w; |
|
30 ga_init2(&e.strings, 1, 100); |
|
31 ! mch_memmove(p, &e, sizeof(e)); |
|
32 serverReply.ga_len++; |
|
33 } |
|
34 } |
|
35 *************** |
|
36 *** 1018,1024 **** |
|
37 p++; |
|
38 count = numItems - (p - regProp); |
|
39 if (count > 0) |
|
40 ! memcpy(entry, p, count); |
|
41 XChangeProperty(dpy, RootWindow(dpy, 0), registryProperty, XA_STRING, |
|
42 8, PropModeReplace, regProp, |
|
43 (int)(numItems - (p - entry))); |
|
44 --- 1018,1024 ---- |
|
45 p++; |
|
46 count = numItems - (p - regProp); |
|
47 if (count > 0) |
|
48 ! mch_memmove(entry, p, count); |
|
49 XChangeProperty(dpy, RootWindow(dpy, 0), registryProperty, XA_STRING, |
|
50 8, PropModeReplace, regProp, |
|
51 (int)(numItems - (p - entry))); |
|
52 *************** |
|
53 *** 1072,1078 **** |
|
54 p++; |
|
55 lastHalf = numItems - (p - regProp); |
|
56 if (lastHalf > 0) |
|
57 ! memcpy(entry, p, lastHalf); |
|
58 numItems = (entry - regProp) + lastHalf; |
|
59 p = entry; |
|
60 continue; |
|
61 --- 1072,1078 ---- |
|
62 p++; |
|
63 lastHalf = numItems - (p - regProp); |
|
64 if (lastHalf > 0) |
|
65 ! mch_memmove(entry, p, lastHalf); |
|
66 numItems = (entry - regProp) + lastHalf; |
|
67 p = entry; |
|
68 continue; |
|
69 *** ../vim-7.2.037/src/version.c Wed Nov 12 14:09:38 2008 |
|
70 --- src/version.c Wed Nov 12 14:51:00 2008 |
|
71 *************** |
|
72 *** 678,679 **** |
|
73 --- 678,681 ---- |
|
74 { /* Add new patch number below this line */ |
|
75 + /**/ |
|
76 + 38, |
|
77 /**/ |
|
78 |
|
79 -- |
|
80 hundred-and-one symptoms of being an internet addict: |
|
81 241. You try to look for Net Search even when you're in File Manager. |
|
82 |
|
83 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ |
|
84 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
|
85 \\\ download, build and distribute -- http://www.A-A-P.org /// |
|
86 \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |
|