aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.1.0069: ScreenLines may not be correctly initialized, causing hang

Browse Source 
Problem:  ScreenLines may not be correctly initialized, causing hang
          (Olaf Seibert, after 9.0.0220)
Solution: always initialize ScreneLines when allocating a screen
          (Olaf Seibert)

ScreenLines and related structures could be left uninitialized
causing a screen update to run into an infinite loop when using latin1
encoding.

Partly caused because by patch 9.0.0220, which makes mb_ptr2len return
zero for NUL

related: #12671
closes: #13946

Signed-off-by: Olaf Seibert <rhialto@falu.nl>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Olaf Seibert 2024-02-01 21:11:16 +01:00 committed by Christian Brabandt
parent 59bafc8171
commit fd472655a9
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/screen.c
View File

@ -2569,6 +2569,25 @@ give_up:
new_LineOffset[new_row] = new_row * Columns; new_LineOffset[new_row] = new_row * Columns;
new_LineWraps[new_row] = FALSE; new_LineWraps[new_row] = FALSE;
(void)vim_memset(new_ScreenLines + new_row * Columns,
' ', (size_t)Columns * sizeof(schar_T));
if (enc_utf8)
{
(void)vim_memset(new_ScreenLinesUC + new_row * Columns,
0, (size_t)Columns * sizeof(u8char_T));
for (int i = 0; i < p_mco; ++i)
(void)vim_memset(new_ScreenLinesC[i]
+ new_row * Columns,
0, (size_t)Columns * sizeof(u8char_T));
}
if (enc_dbcs == DBCS_JPNU)
(void)vim_memset(new_ScreenLines2 + new_row * Columns,
0, (size_t)Columns * sizeof(schar_T));
(void)vim_memset(new_ScreenAttrs + new_row * Columns,
0, (size_t)Columns * sizeof(sattr_T));
(void)vim_memset(new_ScreenCols + new_row * Columns,
0, (size_t)Columns * sizeof(colnr_T));
/* /*
* If the screen is not going to be cleared, copy as much as * If the screen is not going to be cleared, copy as much as
* possible from the old screen to the new one and clear the rest * possible from the old screen to the new one and clear the rest
@ -2577,24 +2596,6 @@ give_up:
*/ */
if (!doclear) if (!doclear)
{ {
(void)vim_memset(new_ScreenLines + new_row * Columns,
' ', (size_t)Columns * sizeof(schar_T));
if (enc_utf8)
{
(void)vim_memset(new_ScreenLinesUC + new_row * Columns,
0, (size_t)Columns * sizeof(u8char_T));
for (int i = 0; i < p_mco; ++i)
(void)vim_memset(new_ScreenLinesC[i]
+ new_row * Columns,
0, (size_t)Columns * sizeof(u8char_T));
}
if (enc_dbcs == DBCS_JPNU)
(void)vim_memset(new_ScreenLines2 + new_row * Columns,
0, (size_t)Columns * sizeof(schar_T));
(void)vim_memset(new_ScreenAttrs + new_row * Columns,
0, (size_t)Columns * sizeof(sattr_T));
(void)vim_memset(new_ScreenCols + new_row * Columns,
0, (size_t)Columns * sizeof(colnr_T));
old_row = new_row + (screen_Rows - Rows); old_row = new_row + (screen_Rows - Rows);
if (old_row >= 0 && ScreenLines != NULL) if (old_row >= 0 && ScreenLines != NULL)
{ {

2
src/version.c
View File

@ -704,6 +704,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 */
/**/
69,
/**/ /**/
68, 68,
/**/ /**/