romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-05-17 15:16:21 +03:00
Code Issues Projects Releases Packages Wiki Activity

tool_help: add checks to avoid unsigned wrap around

Browse source 
Closes #19377
This commit is contained in:
x2018 2025-11-05 23:50:51 +08:00 • committed by Daniel Stenberg
parent f12a81de4f
commit 69622ff37d
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/tool_help.c
View file

@ -87,14 +87,18 @@ static void print_category(unsigned int category, unsigned int cols)
if(len > longdesc)
longdesc = len;
}
if(longopt + longdesc > cols)
if(longdesc > cols)
longopt = 0; /* avoid wrap-around */
else if(longopt + longdesc > cols)
longopt = cols - longdesc;
for(i = 0; helptext[i].opt; ++i)
if(helptext[i].categories & category) {
size_t opt = longopt;
size_t desclen = strlen(helptext[i].desc);
if(opt + desclen >= (cols - 2)) {
/* avoid wrap-around */
if(cols >= 2 && opt + desclen >= (cols - 2)) {
if(desclen < (cols - 2))
opt = (cols - 3) - desclen;
else