updated for version 7.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)

diff --git a/src/screen.c b/src/screen.c
index 7cd72bdce503c2f3177980f43b0c68922bb63de0..870d89af7b2a47ff75411f9b9790785a4f658cb1 100644 (file)
--- 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 12174c7aee044f0965552117bf2c07456b5b5ff6..25f10a355e3f31d39ad38bc4ab314e317e0cb6c8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    404,
 /**/
     403,
 /**/