aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-03 05:14:07 -04:00
Code Activity

patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable

Browse Source 
Problem:    Using STRNCPY() wrongly. Warning for uninitialized variable.
Solution:   Use mch_memmove(). Initialize variable. (Yasuhiro Matsumoto,
            closes #3979)
This commit is contained in:
Bram Moolenaar
2019-02-22 19:14:54 +01:00
parent 882d02eeb5
commit c666388367
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/screen.c
View File

@@ -2547,10 +2547,10 @@ text_to_screenline(win_T *wp, char_u *text, int col)
{ {
#ifdef FEAT_RIGHTLEFT #ifdef FEAT_RIGHTLEFT
if (wp->w_p_rl) if (wp->w_p_rl)
STRNCPY(current_ScreenLine, text, len); mch_memmove(current_ScreenLine, text, len);
else else
#endif #endif
STRNCPY(current_ScreenLine + col, text, len); mch_memmove(current_ScreenLine + col, text, len);
col += len; col += len;
} }
} }

8
src/textprop.c
View File

@@ -17,6 +17,7 @@
* Text properties have a type, which can be used to specify highlighting. * Text properties have a type, which can be used to specify highlighting.
* *
* TODO: * TODO:
* - When using 'cursorline' attributes should be merged. (#3912)
* - Adjust text property column and length when text is inserted/deleted. * - Adjust text property column and length when text is inserted/deleted.
* -> a :substitute with a multi-line match * -> a :substitute with a multi-line match
* -> search for changed_bytes() from misc1.c * -> search for changed_bytes() from misc1.c
@@ -27,7 +28,10 @@
* the index, like DB_MARKED? * the index, like DB_MARKED?
* - Also test line2byte() with many lines, so that ml_updatechunk() is taken * - Also test line2byte() with many lines, so that ml_updatechunk() is taken
* into account. * into account.
* - add mechanism to keep track of changed lines. * - Add mechanism to keep track of changed lines, so that plugin can update
* text properties in these.
* - Perhaps have a window-local option to disable highlighting from text
* properties?
*/ */
#include "vim.h" #include "vim.h"
@@ -158,7 +162,7 @@ f_prop_add(typval_T *argvars, typval_T *rettv UNUSED)
char_u *newtext; char_u *newtext;
int proplen; int proplen;
size_t textlen; size_t textlen;
char_u *props; char_u *props = NULL;
char_u *newprops; char_u *newprops;
textprop_T tmp_prop; textprop_T tmp_prop;
int i; int i;

2
src/version.c
View File

@@ -779,6 +779,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
975,
/**/ /**/
974, 974,
/**/ /**/