drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* environ.cc (regopt): Allocate small local buffer to avoid copying 

twice.  Fixes resource leak (CID 60012).  Add comment.
This commit is contained in:
Corinna Vinschen 2014-06-23 11:43:33 +00:00
parent 686f560ece
commit 9c54570beb
2 changed files with 12 additions and 7 deletions
winsup/cygwin
ChangeLogenviron.cc

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2014-06-23 Corinna Vinschen <corinna@vinschen.de>
* environ.cc (regopt): Allocate small local buffer to avoid copying
twice. Fixes resource leak (CID 60012). Add comment.
2014-06-23 Corinna Vinschen <corinna@vinschen.de> 2014-06-23 Corinna Vinschen <corinna@vinschen.de>
* dll_init.cc (dll_list::alloc): Fix buffer overrun (CID 59940). * dll_init.cc (dll_list::alloc): Fix buffer overrun (CID 59940).

14
winsup/cygwin/environ.cc
View File

@ -780,11 +780,15 @@ ucenv (char *p, const char *eq)
/* Set options from the registry. */ /* Set options from the registry. */
static bool __stdcall static bool __stdcall
regopt (const WCHAR *name, char *buf) regopt (PCWSTR name, char *buf)
{ {
bool parsed_something = false; bool parsed_something = false;
UNICODE_STRING lname; UNICODE_STRING lname;
size_t len = (wcslen(name) + 1) * sizeof (WCHAR); size_t len = (wcslen(name) + 1) * sizeof (WCHAR);
WCHAR lbuf[1024]; /* Use reasonable size to lower stack pressure.
get_string alloca's this additionally and 1024
is more than enough for CYGWIN env var values. */
RtlInitEmptyUnicodeString(&lname, (PWCHAR) alloca (len), len); RtlInitEmptyUnicodeString(&lname, (PWCHAR) alloca (len), len);
wcscpy(lname.Buffer, name); wcscpy(lname.Buffer, name);
RtlDowncaseUnicodeString(&lname, &lname, FALSE); RtlDowncaseUnicodeString(&lname, &lname, FALSE);
@ -792,13 +796,9 @@ regopt (const WCHAR *name, char *buf)
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
{ {
reg_key r (i, KEY_READ, _WIDE (CYGWIN_INFO_PROGRAM_OPTIONS_NAME), NULL); reg_key r (i, KEY_READ, _WIDE (CYGWIN_INFO_PROGRAM_OPTIONS_NAME), NULL);
if (NT_SUCCESS (r.get_string (lname.Buffer, lbuf, 1024, L"")))
if (NT_SUCCESS (r.get_string (lname.Buffer, (PWCHAR) buf,
NT_MAX_PATH, L"")))
{ {
char *newp; sys_wcstombs (buf, NT_MAX_PATH, lbuf);
sys_wcstombs_alloc(&newp, HEAP_NOTHEAP, (PWCHAR) buf);
strcpy(buf, newp);
parse_options (buf); parse_options (buf);
parsed_something = true; parsed_something = true;
break; break;