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

vim-patch:9.0.0733: use of strftime() is not safe (#21228)

Browse Source 
Problem:    Use of strftime() is not safe.
Solution:   Check the return value of strftime().  Use a larger buffer and
            correctly pass the available space. (Dominique Pellé, closes
            vim/vim#11348)

84d14ccdb5

Co-authored-by: Dominique Pelle <dominique.pelle@gmail.com>
This commit is contained in:
zeertzjq
2022-11-29 11:18:15 +08:00
committed by GitHub
parent 65e8ed45de
commit 7328c4de54
5 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/eval/funcs.c
View File

@@ -8445,9 +8445,7 @@ static void f_strftime(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
p = string_convert(&conv, p, NULL);
}
char result_buf[256];
if (p != NULL) {
(void)strftime(result_buf, sizeof(result_buf), p, curtime_ptr);
} else {
if (p == NULL || strftime(result_buf, sizeof(result_buf), p, curtime_ptr) == 0) {
result_buf[0] = NUL;
}

2
src/nvim/hardcopy.c
View File

@@ -2416,7 +2416,7 @@ bool mch_print_begin(prt_settings_T *psettings)
prt_dsc_textline("For", buffer);
prt_dsc_textline("Creator", longVersion);
// Note: to ensure Clean8bit I don't think we can use LC_TIME
char ctime_buf[50];
char ctime_buf[100]; // hopefully enough for every language
char *p_time = os_ctime(ctime_buf, sizeof(ctime_buf));
// Note: os_ctime() adds a \n so we have to remove it :-(
p = (char_u *)vim_strchr(p_time, '\n');

2
src/nvim/memline.c
View File

@@ -1461,7 +1461,7 @@ static time_t swapfile_info(char_u *fname)
msg_puts(_(" dated: "));
#endif
x = file_info.stat.st_mtim.tv_sec;
char ctime_buf[50];
char ctime_buf[100]; // hopefully enough for every language
msg_puts(os_ctime_r(&x, ctime_buf, sizeof(ctime_buf)));
}

10
src/nvim/os/time.c
View File

@@ -186,10 +186,16 @@ char *os_ctime_r(const time_t *restrict clock, char *restrict result, size_t res
struct tm *clock_local_ptr = os_localtime_r(clock, &clock_local);
// MSVC returns NULL for an invalid value of seconds.
if (clock_local_ptr == NULL) {
xstrlcpy(result, _("(Invalid)"), result_len);
xstrlcpy(result, _("(Invalid)"), result_len - 1);
} else {
// xgettext:no-c-format
strftime(result, result_len, _("%a %b %d %H:%M:%S %Y"), clock_local_ptr);
if (strftime(result, result_len - 1, _("%a %b %d %H:%M:%S %Y"), clock_local_ptr) == 0) {
// Quoting "man strftime":
// > If the length of the result string (including the terminating
// > null byte) would exceed max bytes, then strftime() returns 0,
// > and the contents of the array are undefined.
xstrlcpy(result, _("(Invalid)"), result_len - 1);
}
}
xstrlcat(result, "\n", result_len);
return result;

8
src/nvim/undo.c
View File

@@ -2600,12 +2600,16 @@ void undo_fmt_time(char_u *buf, size_t buflen, time_t tt)
if (time(NULL) - tt >= 100) {
struct tm curtime;
os_localtime_r(&tt, &curtime);
size_t n;
if (time(NULL) - tt < (60L * 60L * 12L)) {
// within 12 hours
(void)strftime((char *)buf, buflen, "%H:%M:%S", &curtime);
n = strftime((char *)buf, buflen, "%H:%M:%S", &curtime);
} else {
// longer ago
(void)strftime((char *)buf, buflen, "%Y/%m/%d %H:%M:%S", &curtime);
n = strftime((char *)buf, buflen, "%Y/%m/%d %H:%M:%S", &curtime);
}
if (n == 0) {
buf[0] = NUL;
}
} else {
int64_t seconds = time(NULL) - tt;