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

ops: Fix PVS/V614: use of uninitialized variable

Browse Source 
I have actually no idea how code managed to work and not trigger ASAN/etc here. 
It does not look like a false positive at all.
This commit is contained in:
ZyX
2018-04-15 21:49:47 +03:00
parent dae1975394
commit fc1ebb060e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/ops.c
View File

@@ -3568,7 +3568,7 @@ int do_join(size_t count,
int *comments = NULL; int *comments = NULL;
int remove_comments = (use_formatoptions == TRUE) int remove_comments = (use_formatoptions == TRUE)
&& has_format_option(FO_REMOVE_COMS); && has_format_option(FO_REMOVE_COMS);
bool prev_was_comment; bool prev_was_comment = false;
if (save_undo && u_save(curwin->w_cursor.lnum - 1, if (save_undo && u_save(curwin->w_cursor.lnum - 1,
curwin->w_cursor.lnum + (linenr_T)count) == FAIL) { curwin->w_cursor.lnum + (linenr_T)count) == FAIL) {
@@ -3592,17 +3592,17 @@ int do_join(size_t count,
curwin->w_buffer->b_op_start.col = (colnr_T)STRLEN(curr); curwin->w_buffer->b_op_start.col = (colnr_T)STRLEN(curr);
} }
if (remove_comments) { if (remove_comments) {
/* We don't want to remove the comment leader if the // We don't want to remove the comment leader if the
* previous line is not a comment. */ // previous line is not a comment.
if (t > 0 && prev_was_comment) { if (t > 0 && prev_was_comment) {
char_u *new_curr = skip_comment(curr, TRUE, insert_space, char_u *new_curr = skip_comment(curr, true, insert_space,
&prev_was_comment); &prev_was_comment);
comments[t] = (int)(new_curr - curr); comments[t] = (int)(new_curr - curr);
curr = new_curr; curr = new_curr;
} else } else {
curr = skip_comment(curr, FALSE, insert_space, curr = skip_comment(curr, false, insert_space, &prev_was_comment);
&prev_was_comment); }
} }
if (insert_space && t > 0) { if (insert_space && t > 0) {