GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-16 01:01:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0804: tests: no error check when setting global 'cc'

Browse Source 
Problem:  tests: no error check when setting global 'cc'
Solution: also parse and check global 'cc' value (Milly)

closes: vim/vim#15914

a441a3eaab

Co-authored-by: Milly <milly.ca@gmail.com>
This commit is contained in:
zeertzjq
2024-10-24 06:23:00 +08:00
parent 3d2aca83de
commit 5436d9b3c6
5 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/nvim/window.c
View File

@ -7371,18 +7371,37 @@ static int int_cmp(const void *pa, const void *pb)
return a == b ? 0 : a < b ? -1 : 1;
}
/// Handle setting 'colorcolumn' or 'textwidth' in window "wp".
/// Check "cc" as 'colorcolumn' and update the members of "wp".
/// This is called when 'colorcolumn' or 'textwidth' is changed.
///
/// @param cc when NULL: use "wp->w_p_cc"
/// @param wp when NULL: only parse "cc"
///
/// @return error message, NULL if it's OK.
const char *check_colorcolumn(win_T *wp)
const char *check_colorcolumn(char *cc, win_T *wp)
{
if (wp->w_buffer == NULL) {
if (wp != NULL && wp->w_buffer == NULL) {
return NULL; // buffer was closed
}
char *s;
if (cc != NULL) {
s = cc;
} else {
s = wp->w_p_cc;
}
OptInt tw;
if (wp != NULL) {
tw = wp->w_buffer->b_p_tw;
} else {
// buffer-local value not set, assume zero
tw = 0;
}
unsigned count = 0;
int color_cols[256];
for (char *s = wp->w_p_cc; *s != NUL && count < 255;) {
while (*s != NUL && count < 255) {
int col;
if (*s == '-' || *s == '+') {
// -N and +N: add to 'textwidth'
@ -7392,16 +7411,12 @@ const char *check_colorcolumn(win_T *wp)
return e_invarg;
}
col = col * getdigits_int(&s, true, 0);
if (wp->w_buffer->b_p_tw == 0) {
if (tw == 0) {
goto skip; // 'textwidth' not set, skip this item
}
assert((col >= 0
&& wp->w_buffer->b_p_tw <= INT_MAX - col
&& wp->w_buffer->b_p_tw + col >= INT_MIN)
|| (col < 0
&& wp->w_buffer->b_p_tw >= INT_MIN - col
&& wp->w_buffer->b_p_tw + col <= INT_MAX));
col += (int)wp->w_buffer->b_p_tw;
assert((col >= 0 && tw <= INT_MAX - col && tw + col >= INT_MIN)
|| (col < 0 && tw >= INT_MIN - col && tw + col <= INT_MAX));
col += (int)tw;
if (col < 0) {
goto skip;
}
@ -7423,6 +7438,10 @@ skip:
}
}
if (wp == NULL) {
return NULL; // only parse "cc"
}
xfree(wp->w_p_cc_cols);
if (count == 0) {
wp->w_p_cc_cols = NULL;