aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

updated for version 7.3.169

Browse Source 
Problem:    Freeing memory already freed, warning from static code analyzer.
Solution:   Initialize pointers to NULL, correct use of "mustfree". (partly by
            Dominique Pelle)
This commit is contained in:
Bram Moolenaar
2011-04-28 17:48:44 +02:00
parent 877b97b953
commit b453a53b59
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/misc1.c
View File

@@ -3505,7 +3505,7 @@ init_homedir()
if (enc_utf8 && var != NULL) if (enc_utf8 && var != NULL)
{ {
int len; int len;
char_u *pp; char_u *pp = NULL;
/* Convert from active codepage to UTF-8. Other conversions are /* Convert from active codepage to UTF-8. Other conversions are
* not done, because they would fail for non-ASCII characters. */ * not done, because they would fail for non-ASCII characters. */
@@ -3872,11 +3872,13 @@ expand_env_esc(srcp, dst, dstlen, esc, one, startstr)
* Vim's version of getenv(). * Vim's version of getenv().
* Special handling of $HOME, $VIM and $VIMRUNTIME. * Special handling of $HOME, $VIM and $VIMRUNTIME.
* Also does ACP to 'enc' conversion for Win32. * 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 * char_u *
vim_getenv(name, mustfree) vim_getenv(name, mustfree)
char_u *name; char_u *name;
int *mustfree; /* set to TRUE when returned is allocated */ int *mustfree;
{ {
char_u *p; char_u *p;
char_u *pend; char_u *pend;
@@ -3898,7 +3900,7 @@ vim_getenv(name, mustfree)
if (enc_utf8) if (enc_utf8)
{ {
int len; int len;
char_u *pp; char_u *pp = NULL;
/* Convert from active codepage to UTF-8. Other conversions are /* Convert from active codepage to UTF-8. Other conversions are
* not done, because they would fail for non-ASCII characters. */ * not done, because they would fail for non-ASCII characters. */
@@ -3942,7 +3944,7 @@ vim_getenv(name, mustfree)
if (enc_utf8) if (enc_utf8)
{ {
int len; int len;
char_u *pp; char_u *pp = NULL;
/* Convert from active codepage to UTF-8. Other conversions /* Convert from active codepage to UTF-8. Other conversions
* are not done, because they would fail for non-ASCII * are not done, because they would fail for non-ASCII
@@ -3950,7 +3952,7 @@ vim_getenv(name, mustfree)
acp_to_enc(p, (int)STRLEN(p), &pp, &len); acp_to_enc(p, (int)STRLEN(p), &pp, &len);
if (pp != NULL) if (pp != NULL)
{ {
if (mustfree) if (*mustfree)
vim_free(p); vim_free(p);
p = pp; p = pp;
*mustfree = TRUE; *mustfree = TRUE;

2
src/version.c
View File

@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
169,
/**/ /**/
168, 168,
/**/ /**/