Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-30 19:14:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

This makes RtlUnicodeStringToInteger work like the win2k version. Basically

Browse source 
this function never checks the validity of the input string and only returns
an error when the Base argument is set incorrectly.

This fixes the bug while booting vmware with the pcnet card on.

svn path=/trunk/; revision=9694
This commit is contained in:
Art Yerkes 2004-06-17 03:47:39 +00:00
parent 7d375e8c48
commit 0766c089ec
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
reactos/lib/rtl/unicode.c
View file

@ -673,6 +673,13 @@ RtlPrefixUnicodeString(
/*
* @implemented
*
* Note that regardless of success or failure status, we should leave the
* partial value in Value. An error is never returned based on the chars
* in the string.
*
* This function does check the base. Only 2, 8, 10, 16 are permitted,
* else STATUS_INVALID_PARAMETER is returned.
*/
NTSTATUS
STDCALL
@ -686,10 +693,14 @@ RtlUnicodeStringToInteger(
ULONG i;
ULONG Val;
BOOLEAN addneg = FALSE;
NTSTATUS Status = STATUS_SUCCESS;
*Value = 0;
Str = String->Buffer;
if( Base && Base != 2 && Base != 8 && Base != 10 && Base != 16 )
return STATUS_INVALID_PARAMETER;
for (i = 0; i < String->Length / sizeof(WCHAR); i++)
{
if (*Str == L'b')
@ -723,21 +734,21 @@ RtlUnicodeStringToInteger(
}
else if ((*Str > L'1') && (Base == 2))
{
return STATUS_INVALID_PARAMETER;
break;
}
else if (((*Str > L'7') || (*Str < L'0')) && (Base == 8))
{
return STATUS_INVALID_PARAMETER;
break;
}
else if (((*Str > L'9') || (*Str < L'0')) && (Base == 10))
{
return STATUS_INVALID_PARAMETER;
break;
}
else if ( ((*Str > L'9') || (*Str < L'0')) &&
((towupper (*Str) > L'F') || (towupper (*Str) < L'A')) &&
(Base == 16))
{
return STATUS_INVALID_PARAMETER;
break;
}
Str++;
}
@ -748,8 +759,10 @@ RtlUnicodeStringToInteger(
Base = 10;
while (iswxdigit (*Str) &&
(Val = iswdigit (*Str) ? *Str - L'0' : (iswlower (*Str)
? towupper (*Str) : *Str) - L'A' + 10) < Base)
(Val =
iswdigit (*Str) ?
*Str - L'0' :
(towupper (*Str) - L'A' + 10)) < Base)
{
*Value = *Value * Base + Val;
Str++;
@ -758,7 +771,7 @@ RtlUnicodeStringToInteger(
if (addneg == TRUE)
*Value *= -1;
return STATUS_SUCCESS;
return Status;
}