Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-13 01:22:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix for LoadStringA - return part of string if buffer is to small

Browse source 
svn path=/trunk/; revision=19845
This commit is contained in:
Sebastian Gasiorek 2005-12-03 21:00:55 +00:00
parent dad86fa425
commit 63c14b7666
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reactos/lib/user32/misc/resources.c
View file

@ -98,7 +98,7 @@ int STDCALL LoadStringA
{
UNICODE_STRING wstrResStr;
ANSI_STRING strBuf;
NTSTATUS nErrCode;
INT retSize;
/* parameter validation */
if
@ -125,14 +125,13 @@ int STDCALL LoadStringA
strBuf.MaximumLength = nBufferMax * sizeof(CHAR);
strBuf.Buffer = lpBuffer;
nErrCode = RtlUnicodeStringToAnsiString(&strBuf, &wstrResStr, FALSE);
retSize = WideCharToMultiByte(CP_ACP, 0, wstrResStr.Buffer, wstrResStr.Length / sizeof(WCHAR), strBuf.Buffer, strBuf.MaximumLength, NULL, NULL);
if(!NT_SUCCESS(nErrCode))
{
if(!retSize)
/* failure */
RtlNtStatusToDosError(nErrCode);
return 0;
}
else
strBuf.Length = retSize;
/* the ANSI string may not be null-terminated */
if(strBuf.Length >= strBuf.MaximumLength)