diff options
| author | Olaf Seibert <rhialto@falu.nl> | 2024-02-01 21:11:16 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-02-01 21:11:16 +0100 |
| commit | fd472655a93fd539c731c8daf3adc4e65ddce341 (patch) | |
| tree | 06a95bdbd2783bbebed377e60c2aff8930e16c4f /src | |
| parent | 59bafc8171b08cf326ed40ccb4ee917f9643290e (diff) | |
patch 9.1.0069: ScreenLines may not be correctly initialized, causing hangv9.1.0069
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/screen.c | 37 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 21 insertions, 18 deletions
diff --git a/src/screen.c b/src/screen.c index 032e447a93..939a335999 100644 --- a/src/screen.c +++ b/src/screen.c @@ -2569,6 +2569,25 @@ give_up: new_LineOffset[new_row] = new_row * Columns; 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 * possible from the old screen to the new one and clear the rest @@ -2577,24 +2596,6 @@ give_up: */ 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); if (old_row >= 0 && ScreenLines != NULL) { diff --git a/src/version.c b/src/version.c index ce3c4fde2f..b70c90a26b 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 69, +/**/ 68, /**/ 67, |