mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-22 17:11:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: shell-test: use count for REP (#10514)

Browse Source 
Also fix V576: use width specification

> Incorrect format. Consider checking the third actual argument of the
> 'sscanf' function. It's dangerous to use string specifier without width
> specification. Buffer overflow is possible.
This commit is contained in:
Daniel Hahler
2019-07-16 21:35:53 +02:00
committed by GitHub
parent bab24a88ab
commit 3a1d3e9ef1
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/functional/fixtures/shell-test.c
View File

@@ -33,13 +33,12 @@ static void help(void)
puts(" Prints \"ready $ prog args...\\n\" to stderr."); puts(" Prints \"ready $ prog args...\\n\" to stderr.");
puts(" shell-test -t {prompt text} EXE \"prog args...\""); puts(" shell-test -t {prompt text} EXE \"prog args...\"");
puts(" Prints \"{prompt text} $ progs args...\" to stderr."); puts(" Prints \"{prompt text} $ progs args...\" to stderr.");
puts(" shell-test REP {byte} \"line line line\""); puts(" shell-test REP {count} \"line line line\"");
puts(" Prints \"{lnr}: line line line\\n\" to stdout {byte} times."); puts(" Prints \"{lnr}: line line line\\n\" to stdout {count} times.");
puts(" I.e. for `shell-test REP ab \"test\"'"); puts(" I.e. for `shell-test REP 97 \"test\"'");
puts(" 0: test"); puts(" 0: test");
puts(" ..."); puts(" ...");
puts(" 96: test"); puts(" 96: test");
puts(" will be printed because byte `a' is equal to 97.");
puts(" shell-test INTERACT"); puts(" shell-test INTERACT");
puts(" Prints \"interact $ \" to stderr, and waits for \"exit\" input."); puts(" Prints \"interact $ \" to stderr, and waits for \"exit\" input.");
} }
@@ -71,8 +70,12 @@ int main(int argc, char **argv)
fprintf(stderr, "Not enough REP arguments\n"); fprintf(stderr, "Not enough REP arguments\n");
return 4; return 4;
} }
uint8_t number = (uint8_t) *argv[2]; int count = 0;
for (uint8_t i = 0; i < number; i++) { if (sscanf(argv[2], "%d", &count) != 1) {
fprintf(stderr, "Invalid count: %s\n", argv[2]);
return 4;
}
for (uint8_t i = 0; i < count; i++) {
printf("%d: %s\n", (int) i, argv[3]); printf("%d: %s\n", (int) i, argv[3]);
} }
} else if (strcmp(argv[1], "UTF-8") == 0) { } else if (strcmp(argv[1], "UTF-8") == 0) {
@@ -104,7 +107,7 @@ int main(int argc, char **argv)
break; // EOF break; // EOF
} }
input_argc = sscanf(input, "%s %d", cmd, &arg); input_argc = sscanf(input, "%99s %d", cmd, &arg);
if(1 == input_argc) { if(1 == input_argc) {
arg = 0; arg = 0;
} }

7
test/functional/terminal/edit_spec.lua
View File

@@ -34,10 +34,9 @@ describe(':edit term://*', function()
it("runs TermOpen early enough to set buffer-local 'scrollback'", function() it("runs TermOpen early enough to set buffer-local 'scrollback'", function()
local columns, lines = 20, 4 local columns, lines = 20, 4
local scr = get_screen(columns, lines) local scr = get_screen(columns, lines)
local rep = 'a' local rep = 97
meths.set_option('shellcmdflag', 'REP ' .. rep) meths.set_option('shellcmdflag', 'REP ' .. rep)
command('set shellxquote=') -- win: avoid extra quotes command('set shellxquote=') -- win: avoid extra quotes
local rep_size = rep:byte() -- 'a' => 97
local sb = 10 local sb = 10
command('autocmd TermOpen * :setlocal scrollback='..tostring(sb) command('autocmd TermOpen * :setlocal scrollback='..tostring(sb)
..'|call feedkeys("G", "n")') ..'|call feedkeys("G", "n")')
@@ -45,8 +44,8 @@ describe(':edit term://*', function()
local bufcontents = {} local bufcontents = {}
local winheight = curwinmeths.get_height() local winheight = curwinmeths.get_height()
local buf_cont_start = rep_size - sb - winheight + 2 local buf_cont_start = rep - sb - winheight + 2
for i = buf_cont_start,(rep_size - 1) do for i = buf_cont_start,(rep - 1) do
bufcontents[#bufcontents + 1] = ('%d: foobar'):format(i) bufcontents[#bufcontents + 1] = ('%d: foobar'):format(i)
end end
bufcontents[#bufcontents + 1] = '' bufcontents[#bufcontents + 1] = ''