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

Don't add a terminating null character in RtlCopyString, if the destination buffer isn't large enough.

Browse source 
A ansi/unicode string doesn't need a terminating null character.


svn path=/trunk/; revision=13030
This commit is contained in:
Hartmut Birr 2005-01-13 20:53:35 +00:00
parent 1a99f299a1
commit 7e23b350aa
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2195,11 +2195,14 @@ RtlCopyString(
return;
}
copylen = min (DestinationString->MaximumLength - sizeof(CHAR),
copylen = min (DestinationString->MaximumLength,
SourceString->Length);
memcpy(DestinationString->Buffer, SourceString->Buffer, copylen);
DestinationString->Buffer[copylen] = 0;
if (DestinationString->MaximumLength >= copylen + sizeof(CHAR))
{
DestinationString->Buffer[copylen] = 0;
}
DestinationString->Length = copylen;
}
@ -2222,10 +2225,13 @@ RtlCopyUnicodeString(
return;
}
copylen = min (DestinationString->MaximumLength - sizeof(WCHAR),
copylen = min (DestinationString->MaximumLength,
SourceString->Length);
memcpy(DestinationString->Buffer, SourceString->Buffer, copylen);
DestinationString->Buffer[copylen / sizeof(WCHAR)] = 0;
if (DestinationString->MaximumLength >= copylen + sizeof(WCHAR))
{
DestinationString->Buffer[copylen / sizeof(WCHAR)] = 0;
}
DestinationString->Length = copylen;
}