ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed RtlSetEnvironmentVariable to deal properly with Unicode strings 

that aren't null-terminated.
This commit is contained in:
Alexandre Julliard 2004-05-05 01:39:12 +00:00
parent 4e5b9efcf0
commit 048b3ac67c
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/ntdll/env.c
View File

@ -181,10 +181,14 @@ NTSTATUS WINAPI RtlSetEnvironmentVariable(PWSTR* penv, PUNICODE_STRING name,
penv, debugstr_w(name->Buffer), penv, debugstr_w(name->Buffer),
value ? debugstr_w(value->Buffer) : "--nil--"); value ? debugstr_w(value->Buffer) : "--nil--");
if (!name || !name->Buffer || !name->Buffer[0]) if (!name || !name->Buffer || !name->Length)
return STATUS_INVALID_PARAMETER_1; return STATUS_INVALID_PARAMETER_1;
len = name->Length / sizeof(WCHAR);
/* variable names can't contain a '=' except as a first character */ /* variable names can't contain a '=' except as a first character */
if (strchrW(name->Buffer + 1, '=')) return STATUS_INVALID_PARAMETER; for (p = name->Buffer + 1; p < name->Buffer + len; p++)
if (*p == '=') return STATUS_INVALID_PARAMETER;
if (!penv) if (!penv)
{ {
@ -192,8 +196,6 @@ NTSTATUS WINAPI RtlSetEnvironmentVariable(PWSTR* penv, PUNICODE_STRING name,
env = NtCurrentTeb()->Peb->ProcessParameters->Environment; env = NtCurrentTeb()->Peb->ProcessParameters->Environment;
} else env = *penv; } else env = *penv;
len = name->Length / sizeof(WCHAR);
/* compute current size of environment */ /* compute current size of environment */
for (p = env; *p; p += strlenW(p) + 1); for (p = env; *p; p += strlenW(p) + 1);
old_size = p + 1 - env; old_size = p + 1 - env;
@ -247,11 +249,11 @@ NTSTATUS WINAPI RtlSetEnvironmentVariable(PWSTR* penv, PUNICODE_STRING name,
/* Set the new string */ /* Set the new string */
if (value) if (value)
{ {
static const WCHAR equalW[] = {'=',0}; memcpy( p, name->Buffer, name->Length );
p += name->Length / sizeof(WCHAR);
strcpyW(p, name->Buffer); *p++ = '=';
strcatW(p, equalW); memcpy( p, value->Buffer, value->Length );
strcatW(p, value->Buffer); p[value->Length / sizeof(WCHAR)] = 0;
} }
done: done:
if (!penv) RtlReleasePebLock(); if (!penv) RtlReleasePebLock();