|
 |
2ad59ae |
To: vim-dev@vim.org
|
|
|
2ad59ae |
Subject: Patch 7.2.035
|
|
|
2ad59ae |
Fcc: outbox
|
|
|
2ad59ae |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
2ad59ae |
Mime-Version: 1.0
|
|
|
2ad59ae |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
2ad59ae |
Content-Transfer-Encoding: 8bit
|
|
|
2ad59ae |
------------
|
|
|
2ad59ae |
|
|
|
2ad59ae |
Patch 7.2.035
|
|
|
2ad59ae |
Problem: Mismatches between alloc/malloc, free/vim_free,
|
|
|
2ad59ae |
realloc/vim_realloc.
|
|
|
2ad59ae |
Solution: Use the right function. (Dominique Pelle)
|
|
|
2ad59ae |
Files: src/gui_x11.c, src/mbyte.c, src/misc2.c, src/os_unix.c
|
|
|
2ad59ae |
|
|
|
2ad59ae |
|
|
|
2ad59ae |
*** ../vim-7.2.034/src/gui_x11.c Fri Jun 20 11:59:25 2008
|
|
|
2ad59ae |
--- src/gui_x11.c Wed Nov 12 11:47:03 2008
|
|
|
2ad59ae |
***************
|
|
|
2ad59ae |
*** 2450,2456 ****
|
|
|
2ad59ae |
*colorPtr = colortable[closest];
|
|
|
2ad59ae |
}
|
|
|
2ad59ae |
|
|
|
2ad59ae |
! free(colortable);
|
|
|
2ad59ae |
return OK;
|
|
|
2ad59ae |
}
|
|
|
2ad59ae |
|
|
|
2ad59ae |
--- 2450,2456 ----
|
|
|
2ad59ae |
*colorPtr = colortable[closest];
|
|
|
2ad59ae |
}
|
|
|
2ad59ae |
|
|
|
2ad59ae |
! vim_free(colortable);
|
|
|
2ad59ae |
return OK;
|
|
|
2ad59ae |
}
|
|
|
2ad59ae |
|
|
|
2ad59ae |
*** ../vim-7.2.034/src/mbyte.c Sat Sep 6 16:44:06 2008
|
|
|
2ad59ae |
--- src/mbyte.c Wed Nov 12 11:24:14 2008
|
|
|
2ad59ae |
***************
|
|
|
2ad59ae |
*** 5384,5390 ****
|
|
|
2ad59ae |
draw_feedback = (char *)alloc(draw_data->chg_first
|
|
|
2ad59ae |
+ text->length);
|
|
|
2ad59ae |
else
|
|
|
2ad59ae |
! draw_feedback = realloc(draw_feedback,
|
|
|
2ad59ae |
draw_data->chg_first + text->length);
|
|
|
2ad59ae |
if (draw_feedback != NULL)
|
|
|
2ad59ae |
{
|
|
|
2ad59ae |
--- 5384,5390 ----
|
|
|
2ad59ae |
draw_feedback = (char *)alloc(draw_data->chg_first
|
|
|
2ad59ae |
+ text->length);
|
|
|
2ad59ae |
else
|
|
|
2ad59ae |
! draw_feedback = vim_realloc(draw_feedback,
|
|
|
2ad59ae |
draw_data->chg_first + text->length);
|
|
|
2ad59ae |
if (draw_feedback != NULL)
|
|
|
2ad59ae |
{
|
|
|
2ad59ae |
*** ../vim-7.2.034/src/misc2.c Sat Sep 6 16:44:06 2008
|
|
|
2ad59ae |
--- src/misc2.c Wed Nov 12 11:42:51 2008
|
|
|
2ad59ae |
***************
|
|
|
2ad59ae |
*** 873,879 ****
|
|
|
2ad59ae |
/* 3. check for available memory: call mch_avail_mem() */
|
|
|
2ad59ae |
if (mch_avail_mem(TRUE) < KEEP_ROOM && !releasing)
|
|
|
2ad59ae |
{
|
|
|
2ad59ae |
! vim_free((char *)p); /* System is low... no go! */
|
|
|
2ad59ae |
p = NULL;
|
|
|
2ad59ae |
}
|
|
|
2ad59ae |
else
|
|
|
2ad59ae |
--- 873,879 ----
|
|
|
2ad59ae |
/* 3. check for available memory: call mch_avail_mem() */
|
|
|
2ad59ae |
if (mch_avail_mem(TRUE) < KEEP_ROOM && !releasing)
|
|
|
2ad59ae |
{
|
|
|
2ad59ae |
! free((char *)p); /* System is low... no go! */
|
|
|
2ad59ae |
p = NULL;
|
|
|
2ad59ae |
}
|
|
|
2ad59ae |
else
|
|
|
2ad59ae |
*** ../vim-7.2.034/src/os_unix.c Wed Aug 6 18:45:01 2008
|
|
|
2ad59ae |
--- src/os_unix.c Wed Nov 12 11:55:33 2008
|
|
|
2ad59ae |
***************
|
|
|
2ad59ae |
*** 2905,2911 ****
|
|
|
2ad59ae |
* Ignore any errors.
|
|
|
2ad59ae |
*/
|
|
|
2ad59ae |
#if defined(HAVE_SIGALTSTACK) || defined(HAVE_SIGSTACK)
|
|
|
2ad59ae |
! signal_stack = malloc(SIGSTKSZ);
|
|
|
2ad59ae |
init_signal_stack();
|
|
|
2ad59ae |
#endif
|
|
|
2ad59ae |
}
|
|
|
2ad59ae |
--- 2905,2911 ----
|
|
|
2ad59ae |
* Ignore any errors.
|
|
|
2ad59ae |
*/
|
|
|
2ad59ae |
#if defined(HAVE_SIGALTSTACK) || defined(HAVE_SIGSTACK)
|
|
|
2ad59ae |
! signal_stack = (char *)alloc(SIGSTKSZ);
|
|
|
2ad59ae |
init_signal_stack();
|
|
|
2ad59ae |
#endif
|
|
|
2ad59ae |
}
|
|
|
2ad59ae |
***************
|
|
|
2ad59ae |
*** 6814,6820 ****
|
|
|
2ad59ae |
if (xsmp_icefd != -1)
|
|
|
2ad59ae |
{
|
|
|
2ad59ae |
SmcCloseConnection(xsmp.smcconn, 0, NULL);
|
|
|
2ad59ae |
! vim_free(xsmp.clientid);
|
|
|
2ad59ae |
xsmp.clientid = NULL;
|
|
|
2ad59ae |
xsmp_icefd = -1;
|
|
|
2ad59ae |
}
|
|
|
2ad59ae |
--- 6815,6822 ----
|
|
|
2ad59ae |
if (xsmp_icefd != -1)
|
|
|
2ad59ae |
{
|
|
|
2ad59ae |
SmcCloseConnection(xsmp.smcconn, 0, NULL);
|
|
|
2ad59ae |
! if (xsmp.clientid != NULL)
|
|
|
2ad59ae |
! free(xsmp.clientid);
|
|
|
2ad59ae |
xsmp.clientid = NULL;
|
|
|
2ad59ae |
xsmp_icefd = -1;
|
|
|
2ad59ae |
}
|
|
|
2ad59ae |
*** ../vim-7.2.034/src/version.c Wed Nov 12 12:51:38 2008
|
|
|
2ad59ae |
--- src/version.c Wed Nov 12 13:05:40 2008
|
|
|
2ad59ae |
***************
|
|
|
2ad59ae |
*** 678,679 ****
|
|
|
2ad59ae |
--- 678,681 ----
|
|
|
2ad59ae |
{ /* Add new patch number below this line */
|
|
|
2ad59ae |
+ /**/
|
|
|
2ad59ae |
+ 35,
|
|
|
2ad59ae |
/**/
|
|
|
2ad59ae |
|
|
|
2ad59ae |
--
|
|
|
2ad59ae |
You can tune a file system, but you can't tuna fish
|
|
|
2ad59ae |
-- man tunefs
|
|
|
2ad59ae |
|
|
|
2ad59ae |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
2ad59ae |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
2ad59ae |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
2ad59ae |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|