1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
|
To: vim_dev@googlegroups.com
Subject: Patch 7.3.169
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.169
Problem: Freeing memory already freed, warning from static code analyzer.
Solution: Initialize pointers to NULL, correct use of "mustfree". (partly by
Dominique Pelle)
Files: src/mis1.c
*** ../vim-7.3.168/src/misc1.c 2011-04-28 13:01:59.000000000 +0200
--- src/misc1.c 2011-04-28 17:42:00.000000000 +0200
***************
*** 3505,3511 ****
if (enc_utf8 && var != NULL)
{
int len;
! char_u *pp;
/* Convert from active codepage to UTF-8. Other conversions are
* not done, because they would fail for non-ASCII characters. */
--- 3505,3511 ----
if (enc_utf8 && var != NULL)
{
int len;
! char_u *pp = NULL;
/* Convert from active codepage to UTF-8. Other conversions are
* not done, because they would fail for non-ASCII characters. */
***************
*** 3872,3882 ****
* Vim's version of getenv().
* Special handling of $HOME, $VIM and $VIMRUNTIME.
* Also does ACP to 'enc' conversion for Win32.
*/
char_u *
vim_getenv(name, mustfree)
char_u *name;
! int *mustfree; /* set to TRUE when returned is allocated */
{
char_u *p;
char_u *pend;
--- 3872,3884 ----
* Vim's version of getenv().
* Special handling of $HOME, $VIM and $VIMRUNTIME.
* Also does ACP to 'enc' conversion for Win32.
+ * "mustfree" is set to TRUE when returned is allocated, it must be
+ * initialized to FALSE by the caller.
*/
char_u *
vim_getenv(name, mustfree)
char_u *name;
! int *mustfree;
{
char_u *p;
char_u *pend;
***************
*** 3898,3904 ****
if (enc_utf8)
{
int len;
! char_u *pp;
/* Convert from active codepage to UTF-8. Other conversions are
* not done, because they would fail for non-ASCII characters. */
--- 3900,3906 ----
if (enc_utf8)
{
int len;
! char_u *pp = NULL;
/* Convert from active codepage to UTF-8. Other conversions are
* not done, because they would fail for non-ASCII characters. */
***************
*** 3942,3948 ****
if (enc_utf8)
{
int len;
! char_u *pp;
/* Convert from active codepage to UTF-8. Other conversions
* are not done, because they would fail for non-ASCII
--- 3944,3950 ----
if (enc_utf8)
{
int len;
! char_u *pp = NULL;
/* Convert from active codepage to UTF-8. Other conversions
* are not done, because they would fail for non-ASCII
***************
*** 3950,3956 ****
acp_to_enc(p, (int)STRLEN(p), &pp, &len);
if (pp != NULL)
{
! if (mustfree)
vim_free(p);
p = pp;
*mustfree = TRUE;
--- 3952,3958 ----
acp_to_enc(p, (int)STRLEN(p), &pp, &len);
if (pp != NULL)
{
! if (*mustfree)
vim_free(p);
p = pp;
*mustfree = TRUE;
*** ../vim-7.3.168/src/version.c 2011-04-28 17:30:05.000000000 +0200
--- src/version.c 2011-04-28 17:48:04.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
{ /* Add new patch number below this line */
+ /**/
+ 169,
/**/
--
A day without sunshine is like, well, night.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
