Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-07 18:56:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MAN] AnalyzeArgv(): Fix 2 overruns related to element (#703)

Browse source 
- Also use _countof().
- Also add braces.
- Also enforce consistent "no spaces" style.

Thanks to "devpao" for pointing to this function.

ROSAPPS-344
This commit is contained in:
Serge Gautherie 2018-07-27 21:53:50 +02:00 committed by Hermès BÉLUSCA - MAÏTO
parent 65a5a989c5
commit d69d401325
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/rosapps/applications/sysutils/man/man.c
View file

@ -88,7 +88,7 @@ Usage()
int int
AnalyzeArgv(char *argument) AnalyzeArgv(char *argument)
{ {
int element=0; int element;
char HelpFlag=0; char HelpFlag=0;
char *keys[]={"--help","/h","/?","-h"}; char *keys[]={"--help","/h","/?","-h"};
char *sections[]={".1",".2",".3",".4",".5",".6",".7",".8",".9"}; char *sections[]={".1",".2",".3",".4",".5",".6",".7",".8",".9"};
@ -96,25 +96,32 @@ AnalyzeArgv(char *argument)
strcpy(filename,argument); //save argument value strcpy(filename,argument); //save argument value
for(element=0; element < 5;element++) for(element=0;element<_countof(keys);element++)
{
if(!strcmp(keys[element],argument)) if(!strcmp(keys[element],argument))
{ {
Usage(); Usage();
HelpFlag=1; HelpFlag=1;
} }
}
element = 0; element = 0;
if(!HelpFlag) if(!HelpFlag)
{
if(OpenF(filename)) if(OpenF(filename))
while(OpenF(strcat(filename,sections[element])) && (element<9)) {
while(element<_countof(sections)&&OpenF(strcat(filename,sections[element])))
{ {
strcpy(filename,argument); strcpy(filename,argument);
element++; element++;
} }
if(element>8) printf("No manual for %s\n",argument); if(element>=_countof(sections)) printf("No manual for %s\n",argument);
}
}
return element; return element;
} }