mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-11 22:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): check for inclusive buffer line index out of bounds correctly (#19056)

Browse Source
This commit is contained in:
zeertzjq
2022-06-23 21:38:00 +08:00
committed by GitHub
parent 7718b75846
commit 3c85fd817e
2 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvim/api/buffer.c
View File

@@ -554,13 +554,13 @@ void nvim_buf_set_text(uint64_t channel_id, Buffer buffer, Integer start_row, In
// check range is ordered and everything!
// start_row, end_row within buffer len (except add text past the end?)
start_row = normalize_index(buf, start_row, false, &oob);
if (oob || start_row == buf->b_ml.ml_line_count + 1) {
if (oob) {
api_set_error(err, kErrorTypeValidation, "start_row out of bounds");
return;
}
end_row = normalize_index(buf, end_row, false, &oob);
if (oob || end_row == buf->b_ml.ml_line_count + 1) {
if (oob) {
api_set_error(err, kErrorTypeValidation, "end_row out of bounds");
return;
}
@@ -1359,14 +1359,15 @@ static void fix_cursor(linenr_T lo, linenr_T hi, linenr_T extra)
// Normalizes 0-based indexes to buffer line numbers
static int64_t normalize_index(buf_T *buf, int64_t index, bool end_exclusive, bool *oob)
{
int64_t line_count = buf->b_ml.ml_line_count;
assert(buf->b_ml.ml_line_count > 0);
int64_t max_index = buf->b_ml.ml_line_count + (int)end_exclusive - 1;
// Fix if < 0
index = index < 0 ? line_count + index + (int)end_exclusive : index;
index = index < 0 ? max_index + index + 1 : index;
// Check for oob
if (index > line_count) {
if (index > max_index) {
*oob = true;
index = line_count;
index = max_index;
} else if (index < 0) {
*oob = true;
index = 0;