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

Fixed some wrong size calculations in GetEnvironmentStringsA().

Browse source 
Fixed a wrong return value in GetEnvironmentVariableA().

svn path=/trunk/; revision=2810
This commit is contained in:
Hartmut Birr 2002-04-01 22:08:20 +00:00
parent 6c10b3528a
commit de299abd9a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/lib/kernel32/misc/env.c
View file

@ -1,4 +1,4 @@
/* $Id: env.c,v 1.12 2002/03/17 17:56:57 hbirr Exp $ /* $Id: env.c,v 1.13 2002/04/01 22:08:20 hbirr Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
@ -72,7 +72,7 @@ GetEnvironmentVariableA (
SetLastErrorByStatus (Status); SetLastErrorByStatus (Status);
if (Status == STATUS_BUFFER_TOO_SMALL) if (Status == STATUS_BUFFER_TOO_SMALL)
{ {
return VarNameU.Length / sizeof(WCHAR) + 1; return VarValueU.Length / sizeof(WCHAR) + 1;
} }
else else
{ {
@ -300,7 +300,7 @@ GetEnvironmentStringsA (
DPRINT("EnvPtr %p\n", EnvPtr); DPRINT("EnvPtr %p\n", EnvPtr);
/* convert unicode environment to ansi */ /* convert unicode environment to ansi */
UnicodeString.MaximumLength = Length + sizeof(WCHAR); UnicodeString.MaximumLength = Length * sizeof(WCHAR) + sizeof(WCHAR);
UnicodeString.Buffer = EnvU; UnicodeString.Buffer = EnvU;
AnsiString.MaximumLength = Length + 1; AnsiString.MaximumLength = Length + 1;
@ -312,16 +312,16 @@ GetEnvironmentStringsA (
while (*(UnicodeString.Buffer)) while (*(UnicodeString.Buffer))
{ {
UnicodeString.Length = wcslen (UnicodeString.Buffer) * sizeof(WCHAR); UnicodeString.Length = wcslen (UnicodeString.Buffer) * sizeof(WCHAR);
UnicodeString.MaximumLength = UnicodeString.Length + sizeof(WCHAR);
if (UnicodeString.Length > 0) if (UnicodeString.Length > 0)
{ {
DPRINT("UnicodeString.Buffer \'%S\'\n", UnicodeString.Buffer); AnsiString.Length = 0;
AnsiString.MaximumLength = Length + 1 - (AnsiString.Buffer - EnvPtr);
RtlUnicodeStringToAnsiString (&AnsiString, RtlUnicodeStringToAnsiString (&AnsiString,
&UnicodeString, &UnicodeString,
FALSE); FALSE);
DPRINT("AnsiString.Buffer \'%s\'\n", AnsiString.Buffer);
AnsiString.Buffer += (AnsiString.Length + 1); AnsiString.Buffer += (AnsiString.Length + 1);
UnicodeString.Buffer += ((UnicodeString.Length / sizeof(WCHAR)) + 1); UnicodeString.Buffer += ((UnicodeString.Length / sizeof(WCHAR)) + 1);
} }