in display_string(), properly handle buf[start_index]'s being a null
terminator git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3749 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
Этот коммит содержится в:
родитель
f1a8e7221d
Коммит
567d471681
@ -51,6 +51,10 @@ CVS code -
|
||||
- help.c:
|
||||
do_help()
|
||||
- Simplify screen update handling and exiting. (DLR)
|
||||
- winio.c:
|
||||
display_string()
|
||||
- Properly handle buf[start_index]'s being a null terminator.
|
||||
(DLR)
|
||||
- doc/syntax/c.nanorc:
|
||||
- Since .i and .ii are preprocessed C and C++ output, colorize
|
||||
them here. (Mike Frysinger)
|
||||
|
@ -1809,8 +1809,8 @@ char *display_string(const char *buf, size_t start_col, size_t len, bool
|
||||
|
||||
index = 0;
|
||||
|
||||
if (buf[start_index] != '\t' && (column < start_col || (dollars &&
|
||||
column > 0))) {
|
||||
if (buf[start_index] != '\0' && buf[start_index] != '\t' &&
|
||||
(column < start_col || (dollars && column > 0))) {
|
||||
/* We don't display all of buf[start_index] since it starts to
|
||||
* the left of the screen. */
|
||||
buf_mb_len = parse_mbchar(buf + start_index, buf_mb, NULL);
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user