Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-12 06:06:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed returned status code in RtlAnsiStringToUnicodeString and properly free allocated memory in case converting the string failed

Browse source 
svn path=/trunk/; revision=20449
This commit is contained in:
Thomas Bluemel 2005-12-30 00:18:48 +00:00
parent 7d203ec76d
commit 484ec5bcf7
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -75,15 +75,15 @@ RtlAnsiStringToUnicodeString(
if (Length > MAXUSHORT) return STATUS_INVALID_PARAMETER_2; if (Length > MAXUSHORT) return STATUS_INVALID_PARAMETER_2;
UniDest->Length = (USHORT)Length - sizeof(WCHAR); UniDest->Length = (USHORT)Length - sizeof(WCHAR);
if (AllocateDestinationString == TRUE) if (AllocateDestinationString)
{ {
UniDest->Buffer = RtlpAllocateStringMemory(Length, TAG_USTR); UniDest->Buffer = RtlpAllocateStringMemory(Length, TAG_USTR);
UniDest->MaximumLength = Length; UniDest->MaximumLength = Length;
if (!UniDest->Buffer) return STATUS_NO_MEMORY; if (!UniDest->Buffer) return STATUS_NO_MEMORY;
} }
else if (Length >= UniDest->MaximumLength) else if (UniDest->Length >= UniDest->MaximumLength)
{ {
return STATUS_BUFFER_TOO_SMALL; return STATUS_BUFFER_OVERFLOW;
} }
Status = RtlMultiByteToUnicodeN(UniDest->Buffer, Status = RtlMultiByteToUnicodeN(UniDest->Buffer,
@ -92,9 +92,13 @@ RtlAnsiStringToUnicodeString(
AnsiSource->Buffer, AnsiSource->Buffer,
AnsiSource->Length); AnsiSource->Length);
if (!NT_SUCCESS(Status) && AllocateDestinationString) if (!NT_SUCCESS(Status))
{ {
RtlpFreeStringMemory(UniDest->Buffer, TAG_USTR); if (AllocateDestinationString)
{
RtlpFreeStringMemory(UniDest->Buffer, TAG_USTR);
UniDest->Buffer = NULL;
}
return Status; return Status;
} }