diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-03-23 15:36:35 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-03-23 15:36:35 +0100 |
| commit | 70c49c1af4e2250210bf0528a6763be181a98c46 (patch) | |
| tree | 13715dbc37a41619e901d048a48e2fd7ad361d90 | |
| parent | 53339b287727f1b5cbcc0da5563b011ce30f3f03 (diff) | |
| download | vim-git-70c49c1af4e2250210bf0528a6763be181a98c46.tar.gz | |
updated for version 7.2.406v7.2.406
Problem: Patch 7.2.119 introduces uninit mem read. (Dominique Pelle)
Solution: Only used ScreeenLinesC when ScreeenLinesUC is not zero. (Yukihiro
Nakadaira) Also clear ScreeenLinesC when allocating.
| -rw-r--r-- | src/screen.c | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/screen.c b/src/screen.c index 870d89af7..7f929ac0f 100644 --- a/src/screen.c +++ b/src/screen.c @@ -25,10 +25,11 @@ * one character which occupies two display cells. * For UTF-8 a multi-byte character is converted to Unicode and stored in * ScreenLinesUC[]. ScreenLines[] contains the first byte only. For an ASCII - * character without composing chars ScreenLinesUC[] will be 0. When the - * character occupies two display cells the next byte in ScreenLines[] is 0. + * character without composing chars ScreenLinesUC[] will be 0 and + * ScreenLinesC[][] is not used. When the character occupies two display + * cells the next byte in ScreenLines[] is 0. * ScreenLinesC[][] contain up to 'maxcombine' composing characters - * (drawn on top of the first character). They are 0 when not used. + * (drawn on top of the first character). There is 0 after the last one used. * ScreenLines2[] is only used for euc-jp to store the second byte if the * first byte is 0x8e (single-width character). * @@ -4893,6 +4894,7 @@ static int comp_char_differs __ARGS((int, int)); /* * Return if the composing characters at "off_from" and "off_to" differ. + * Only to be used when ScreenLinesUC[off_from] != 0. */ static int comp_char_differs(off_from, off_to) @@ -6281,6 +6283,7 @@ static int screen_comp_differs __ARGS((int, int*)); /* * Return TRUE if composing characters for screen posn "off" differs from * composing characters in "u8cc". + * Only to be used when ScreenLinesUC[off] != 0. */ static int screen_comp_differs(off, u8cc) @@ -6461,8 +6464,10 @@ screen_puts_len(text, len, row, col, attr) && c == 0x8e && ScreenLines2[off] != ptr[1]) || (enc_utf8 - && (ScreenLinesUC[off] != (u8char_T)(c >= 0x80 ? u8c : 0) - || screen_comp_differs(off, u8cc))) + && (ScreenLinesUC[off] != + (u8char_T)(c < 0x80 && u8cc[0] == 0 ? 0 : u8c) + || (ScreenLinesUC[off] != 0 + && screen_comp_differs(off, u8cc)))) #endif || ScreenAttrs[off] != attr || exmode_active; @@ -7542,7 +7547,7 @@ retry: new_ScreenLinesUC = (u8char_T *)lalloc((long_u)( (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); for (i = 0; i < p_mco; ++i) - new_ScreenLinesC[i] = (u8char_T *)lalloc((long_u)( + new_ScreenLinesC[i] = (u8char_T *)lalloc_clear((long_u)( (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); } if (enc_dbcs == DBCS_JPNU) diff --git a/src/version.c b/src/version.c index 19b2851e7..59092b38e 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 */ /**/ + 406, +/**/ 405, /**/ 404, |