summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-03-23 13:56:59 +0100
committerBram Moolenaar <Bram@vim.org>2010-03-23 13:56:59 +0100
commit216b71069ab33a77a5c2899ce9b0c11423a85ade (patch)
tree0b87abc8121b997bc0c8bc45da4a18e5ff8b3db7
parent94127e4abc4d33ed5efc5f08f87d4733fe0ab354 (diff)
downloadvim-git-216b71069ab33a77a5c2899ce9b0c11423a85ade.tar.gz
updated for version 7.2.404v7.2.404
Problem: Pointers for composing characters are not properly initialized. Solution: Compute the size of the pointer, not what it points to. (Yukihiro Nakadaira)
-rw-r--r--src/screen.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c
index 7cd72bdce..870d89af7 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -7536,7 +7536,7 @@ retry:
new_ScreenLines = (schar_T *)lalloc((long_u)(
(Rows + 1) * Columns * sizeof(schar_T)), FALSE);
#ifdef FEAT_MBYTE
- vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T) * MAX_MCO);
+ vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO);
if (enc_utf8)
{
new_ScreenLinesUC = (u8char_T *)lalloc((long_u)(
diff --git a/src/version.c b/src/version.c
index 12174c7ae..25f10a355 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 404,
+/**/
403,
/**/
402,