Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DISKPART] Fix help for multi-word command crashing. (#4873)

Browse source 
* [DISKPART] Fix help for multi-word command crashing.

When the HELP command is executed for a multi-word command,
for example "HELP CREATE PARTITION PRIMARY", diskpart crashes.
This happens because before the desired form of the command
is encountered, its single word form is found - since the first word
of the command matches the one HELP is looking for, it tries to
compare the second word of the input command with the second
(nonexistent) word of the encountered single word command,
which is NULL. This results in diskpart crashing.
The fix makes HELP check if the to-be-compared word is not NULL,
before calling wcsicmp.
This commit is contained in:
Marcin Jabłoński 2022-11-12 13:02:33 +01:00 committed by GitHub
parent c47758b102
commit 6a3a79bb72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
base/system/diskpart/help.c
View file

@ -60,7 +60,7 @@ HelpCommand(
{
if (pCommand->cmd1 != NULL && pCommand->cmd2 == NULL && pCommand->cmd3 == NULL)
{
if ((wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) &&
if ((cmdptr->cmd1 != NULL && wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) &&
(cmdptr->cmd2 != NULL) &&
(cmdptr->cmd3 == NULL) &&
(cmdptr->help != IDS_NONE))
@ -72,8 +72,8 @@ HelpCommand(
}
else if (pCommand->cmd1 != NULL && pCommand->cmd2 != NULL && pCommand->cmd3 == NULL)
{
if ((wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) &&
(wcsicmp(pCommand->cmd2, cmdptr->cmd2) == 0) &&
if ((cmdptr->cmd1 != NULL && wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) &&
(cmdptr->cmd2 != NULL && wcsicmp(pCommand->cmd2, cmdptr->cmd2) == 0) &&
(cmdptr->cmd3 != NULL) &&
(cmdptr->help != IDS_NONE))
{
@ -84,9 +84,9 @@ HelpCommand(
}
else if (pCommand->cmd1 != NULL && pCommand->cmd2 != NULL && pCommand->cmd3 != NULL)
{
if ((wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) &&
(wcsicmp(pCommand->cmd2, cmdptr->cmd2) == 0) &&
(wcsicmp(pCommand->cmd3, cmdptr->cmd3) == 0) &&
if ((cmdptr->cmd1 != NULL && wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) &&
(cmdptr->cmd2 != NULL && wcsicmp(pCommand->cmd2, cmdptr->cmd2) == 0) &&
(cmdptr->cmd3 != NULL && wcsicmp(pCommand->cmd3, cmdptr->cmd3) == 0) &&
(cmdptr->help_detail != MSG_NONE))
{
ConMsgPuts(StdOut,
@ -134,21 +134,27 @@ BOOL help_main(INT argc, LPWSTR *argv)
for (cmdptr = cmds; cmdptr->cmd1; cmdptr++)
{
if ((cmdptr1 == NULL) &&
(wcsicmp(argv[1], cmdptr->cmd1) == 0))
(cmdptr->cmd1 != NULL && wcsicmp(argv[1], cmdptr->cmd1) == 0))
{
cmdptr1 = cmdptr;
}
if ((cmdptr2 == NULL) &&
(argc >= 3) &&
(wcsicmp(argv[1], cmdptr->cmd1) == 0) &&
(wcsicmp(argv[2], cmdptr->cmd2) == 0))
(cmdptr->cmd1 != NULL && wcsicmp(argv[1], cmdptr->cmd1) == 0) &&
(cmdptr->cmd2 != NULL && wcsicmp(argv[2], cmdptr->cmd2) == 0))
{
cmdptr2 = cmdptr;
}
if ((cmdptr3 == NULL) &&
(argc >= 4) &&
(wcsicmp(argv[1], cmdptr->cmd1) == 0) &&
(wcsicmp(argv[2], cmdptr->cmd2) == 0) &&
(wcsicmp(argv[3], cmdptr->cmd3) == 0))
(cmdptr->cmd1 != NULL && wcsicmp(argv[1], cmdptr->cmd1) == 0) &&
(cmdptr->cmd2 != NULL && wcsicmp(argv[2], cmdptr->cmd2) == 0) &&
(cmdptr->cmd3 != NULL && wcsicmp(argv[3], cmdptr->cmd3) == 0))
{
cmdptr3 = cmdptr;
}
}
if (cmdptr3 != NULL)