Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 18:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PING]

Browse source 
Fix crash if option, which needs number is on the end of command line
Get rid of GetULONG and GetULONG2 functions. MS doesn't check input so precisely
Command line options can be preceded by "/"

See issue #6047 for more details.

svn path=/trunk/; revision=51177
This commit is contained in:
Rafal Harabien 2011-03-27 22:47:59 +00:00
parent 8174c5cfde
commit 54cac2ef9e
1 changed files with 47 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
reactos/base/applications/network/ping/ping.c
View file

@ -59,7 +59,6 @@ typedef struct _ICMP_ECHO_PACKET
#pragma pack(1)
BOOL InvalidOption;
BOOL NeverStop;
BOOL ResolveAddresses;
UINT PingCount;
@ -213,84 +212,71 @@ static VOID Reset(VOID)
}
}
/* Return ULONG in a string */
static ULONG GetULONG(LPWSTR String)
{
UINT i, Length;
ULONG Value;
LPWSTR StopString;
i = 0;
Length = (UINT)wcslen(String);
while ((i < Length) && ((String[i] < L'0') || (String[i] > L'9'))) i++;
if ((i >= Length) || ((String[i] < L'0') || (String[i] > L'9')))
{
InvalidOption = TRUE;
return 0;
}
Value = wcstoul(&String[i], &StopString, 10);
return Value;
}
/* Return ULONG in a string. Try next paramter if not successful */
static ULONG GetULONG2(LPWSTR String1, LPWSTR String2, PINT i)
{
ULONG Value;
Value = GetULONG(String1);
if (InvalidOption)
{
InvalidOption = FALSE;
if (String2[0] != L'-')
{
Value = GetULONG(String2);
if (!InvalidOption)
*i += 1;
}
}
return Value;
}
/* Parse command line parameters */
static BOOL ParseCmdline(int argc, LPWSTR argv[])
{
INT i;
BOOL ShowUsage;
BOOL FoundTarget;
BOOL FoundTarget = FALSE, InvalidOption = FALSE;
if (argc < 2)
ShowUsage = TRUE;
else
ShowUsage = FALSE;
FoundTarget = FALSE;
InvalidOption = FALSE;
{
Usage();
return FALSE;
}
for (i = 1; i < argc; i++)
{
if (argv[i][0] == L'-')
if (argv[i][0] == L'-' || argv[i][0] == L'/')
{
switch (argv[i][1])
{
case L't': NeverStop = TRUE; break;
case L'a': ResolveAddresses = TRUE; break;
case L'n': PingCount = GetULONG2(&argv[i][2], argv[i + 1], &i); break;
case L'n':
if (i + 1 < argc)
PingCount = wcstoul(argv[++i], NULL, 0);
else
InvalidOption = TRUE;
break;
case L'l':
DataSize = GetULONG2(&argv[i][2], argv[i + 1], &i);
if (DataSize > ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET) - sizeof(IPv4_HEADER))
if (i + 1 < argc)
{
FormatOutput(IDS_BAD_VALUE_OPTION_L, ICMP_MAXSIZE - \
(int)sizeof(ICMP_ECHO_PACKET) - \
(int)sizeof(IPv4_HEADER));
return FALSE;
}
DataSize = wcstoul(argv[++i], NULL, 0);
if (DataSize > ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET) - sizeof(IPv4_HEADER))
{
FormatOutput(IDS_BAD_VALUE_OPTION_L, ICMP_MAXSIZE - \
(int)sizeof(ICMP_ECHO_PACKET) - \
(int)sizeof(IPv4_HEADER));
return FALSE;
}
} else
InvalidOption = TRUE;
break;
case L'f': DontFragment = TRUE; break;
case L'i': TTLValue = GetULONG2(&argv[i][2], argv[i + 1], &i); break;
case L'v': TOSValue = GetULONG2(&argv[i][2], argv[i + 1], &i); break;
case L'w': Timeout = GetULONG2(&argv[i][2], argv[i + 1], &i); break;
case L'i':
if (i + 1 < argc)
TTLValue = wcstoul(argv[++i], NULL, 0);
else
InvalidOption = TRUE;
break;
case L'v':
if (i + 1 < argc)
TOSValue = wcstoul(argv[++i], NULL, 0);
else
InvalidOption = TRUE;
break;
case L'w':
if (i + 1 < argc)
Timeout = wcstoul(argv[++i], NULL, 0);
else
InvalidOption = TRUE;
break;
case '?':
Usage();
return FALSE;
default:
FormatOutput(IDS_BAD_OPTION, argv[i]);
Usage();
return FALSE;
}
if (InvalidOption)
@ -314,17 +300,12 @@ static BOOL ParseCmdline(int argc, LPWSTR argv[])
}
}
if ((!ShowUsage) && (!FoundTarget))
if (!FoundTarget)
{
FormatOutput(IDS_DEST_MUST_BE_SPECIFIED);
return FALSE;
}
if (ShowUsage)
{
Usage();
return FALSE;
}
return TRUE;
}