mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-28 00:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:98a0cbf: patch 9.1.1971: crash with invalid positional argument 0 in printf() (#36919)

Browse Source 
Problem:  crash with invalid positional argument 0 in printf()
Solution: Reject positional arguments <= 0.

closes: vim/vim#18898

98a0cbf05b

Co-authored-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2025-12-12 08:14:58 +08:00
parent cfb586a77b
commit a66fce6fab
5 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/doc/vimfn.txt
View File

@@ -7419,24 +7419,24 @@ printf({fmt}, {expr1} ...) *printf()*
<
*E1502*
You can re-use a [field-width] (or [precision]) argument: >vim
echo printf("%1$d at width %2$d is: %01$*2$d", 1, 2)
echo printf("%1$d at width %2$d is: %1$0*2$d", 1, 2)
" 1 at width 2 is: 01
<
However, you can't use it as a different type: >vim
echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
echo printf("%1$d at width %2$ld is: %1$0*2$d", 1, 2)
" E1502: Positional argument 2 used as field width reused as
" different type: long int/int
<
*E1503*
When a positional argument is used, but not the correct number
or arguments is given, an error is raised: >vim
echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
echo printf("%1$d at width %2$d is: %1$0*2$.*3$d", 1, 2)
" E1503: Positional argument 3 out of bounds: %1$d at width
" %2$d is: %01$*2$.*3$d
" %2$d is: %1$0*2$.*3$d
<
Only the first error is reported: >vim
echo printf("%01$*2$.*3$d %4$d", 1, 2)
" E1503: Positional argument 3 out of bounds: %01$*2$.*3$d
echo printf("%1$0*2$.*3$d %4$d", 1, 2)
" E1503: Positional argument 3 out of bounds: %1$0*2$.*3$d
" %4$d
<
*E1504*

12
runtime/lua/vim/_meta/vimfn.lua generated
View File

@@ -6744,24 +6744,24 @@ function vim.fn.prevnonblank(lnum) end
--- <
--- *E1502*
--- You can re-use a [field-width] (or [precision]) argument: >vim
--- echo printf("%1$d at width %2$d is: %01$*2$d", 1, 2)
--- echo printf("%1$d at width %2$d is: %1$0*2$d", 1, 2)
--- " 1 at width 2 is: 01
--- <
--- However, you can't use it as a different type: >vim
--- echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
--- echo printf("%1$d at width %2$ld is: %1$0*2$d", 1, 2)
--- " E1502: Positional argument 2 used as field width reused as
--- " different type: long int/int
--- <
--- *E1503*
--- When a positional argument is used, but not the correct number
--- or arguments is given, an error is raised: >vim
--- echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
--- echo printf("%1$d at width %2$d is: %1$0*2$.*3$d", 1, 2)
--- " E1503: Positional argument 3 out of bounds: %1$d at width
--- " %2$d is: %01$*2$.*3$d
--- " %2$d is: %1$0*2$.*3$d
--- <
--- Only the first error is reported: >vim
--- echo printf("%01$*2$.*3$d %4$d", 1, 2)
--- " E1503: Positional argument 3 out of bounds: %01$*2$.*3$d
--- echo printf("%1$0*2$.*3$d %4$d", 1, 2)
--- " E1503: Positional argument 3 out of bounds: %1$0*2$.*3$d
--- " %4$d
--- <
--- *E1504*

12
src/nvim/eval.lua
View File

@@ -8191,24 +8191,24 @@ M.funcs = {
<
*E1502*
You can re-use a [field-width] (or [precision]) argument: >vim
echo printf("%1$d at width %2$d is: %01$*2$d", 1, 2)
echo printf("%1$d at width %2$d is: %1$0*2$d", 1, 2)
" 1 at width 2 is: 01
<
However, you can't use it as a different type: >vim
echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
echo printf("%1$d at width %2$ld is: %1$0*2$d", 1, 2)
" E1502: Positional argument 2 used as field width reused as
" different type: long int/int
<
*E1503*
When a positional argument is used, but not the correct number
or arguments is given, an error is raised: >vim
echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
echo printf("%1$d at width %2$d is: %1$0*2$.*3$d", 1, 2)
" E1503: Positional argument 3 out of bounds: %1$d at width
" %2$d is: %01$*2$.*3$d
" %2$d is: %1$0*2$.*3$d
<
Only the first error is reported: >vim
echo printf("%01$*2$.*3$d %4$d", 1, 2)
" E1503: Positional argument 3 out of bounds: %01$*2$.*3$d
echo printf("%1$0*2$.*3$d %4$d", 1, 2)
" E1503: Positional argument 3 out of bounds: %1$0*2$.*3$d
" %4$d
<
*E1504*

5
src/nvim/strings.c
View File

@@ -968,6 +968,11 @@ static char *format_typename(const char *type)
static int adjust_types(const char ***ap_types, int arg, int *num_posarg, const char *type)
FUNC_ATTR_NONNULL_ALL
{
if (arg <= 0) {
semsg(_(e_invalid_format_specifier_str), type);
return FAIL;
}
if (*ap_types == NULL || *num_posarg < arg) {
const char **new_types = *ap_types == NULL
? xcalloc((size_t)arg, sizeof(const char *))

2
test/old/testdir/test_format.vim
View File

@@ -300,6 +300,8 @@ func Test_printf_pos_errors()
call CheckLegacyAndVim9Failure(["call printf('%1$1$.5d', 5)"], "E1505:")
call CheckLegacyAndVim9Failure(["call printf('%1$5.1$d', 5)"], "E1505:")
call CheckLegacyAndVim9Failure(["call printf('%1$1$.1$d', 5)"], "E1505:")
call CheckLegacyAndVim9Failure(["call printf('%1$*1$.*0$s')"], "E1505:")
call CheckLegacyAndVim9Failure(["call printf('%*0$s')"], "E1505:")
call CheckLegacyAndVim9Failure(["call printf('%.123456789$d', 5)"], "E1510:")
call CheckLegacyAndVim9Failure(["call printf('%.123456789d', 5)"], "E1510:")