averello/vim-mirror
1
0
Fork 0
mirror of https://github.com/vim/vim.git synced 2025-12-13 20:36:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1975: blob2str() may call STRNCPY() with a NULL pointer

Browse Source 
Problem:  blob2str() may call strcpy with a NULL pointer
Solution: Check for NULL before calling STRNCPY()

closes: #18907

Signed-off-by: Foxe Chen <chen.foxe@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Foxe Chen
2025-12-12 08:52:07 +01:00
committed by Christian Brabandt
parent 353103e59a
commit 3d06113c8c
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/strings.c
View File

@@ -1242,6 +1242,7 @@ string_from_blob(blob_T *blob, long *start_idx)
garray_T str_ga; garray_T str_ga;
long blen; long blen;
int idx; int idx;
char_u *ret_str = NULL;
ga_init2(&str_ga, sizeof(char), 80); ga_init2(&str_ga, sizeof(char), 80);
@@ -1262,7 +1263,8 @@ string_from_blob(blob_T *blob, long *start_idx)
ga_append(&str_ga, byte); ga_append(&str_ga, byte);
} }
char_u *ret_str = vim_strnsave(str_ga.ga_data, str_ga.ga_len); if (str_ga.ga_data != NULL)
ret_str = vim_strnsave(str_ga.ga_data, str_ga.ga_len);
*start_idx = idx; *start_idx = idx;
ga_clear(&str_ga); ga_clear(&str_ga);

2
src/version.c
View File

@@ -734,6 +734,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 */
/**/
1975,
/**/ /**/
1974, 1974,
/**/ /**/