From 16828fc5d4c7a335fae49be1d3f823b655825da8 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Wed, 18 Jul 2001 17:05:34 +0000 Subject: * cygheap.cc (_cmalloc): Use correct constants for size calculation. * dcrt0.cc (dll_crt0_1): Move uid initialization earlier. * fork.cc (fork_parent): Move cygheap_setup_in_child to just prior to CreateProcess so that all contents of cygheap are copied. * spawn.cc (spawn_guts): Ditto. --- winsup/cygwin/ChangeLog | 8 ++++++++ winsup/cygwin/cygheap.cc | 5 +++-- winsup/cygwin/dcrt0.cc | 2 +- winsup/cygwin/fork.cc | 2 +- winsup/cygwin/spawn.cc | 7 ++++--- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index cfd42e28b..1d5061c70 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,11 @@ +Wed 18 Jul 2001 01:00:47 PM EDT Christopher Faylor + + * cygheap.cc (_cmalloc): Use correct constants for size calculation. + * dcrt0.cc (dll_crt0_1): Move uid initialization earlier. + * fork.cc (fork_parent): Move cygheap_setup_in_child to just prior to + CreateProcess so that all contents of cygheap are copied. + * spawn.cc (spawn_guts): Ditto. + Wed 18 Jul 2001 12:54:17 Corinna Vinschen * security.cc (get_user_groups): Call Net function with NULL server diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc index 37350b1dd..9d1eeeb7e 100644 --- a/winsup/cygwin/cygheap.cc +++ b/winsup/cygwin/cygheap.cc @@ -167,10 +167,11 @@ static void *__stdcall _cmalloc (int size) { _cmalloc_entry *rvc; - int b, sz; + unsigned b, sz; /* Calculate "bit bucket" and size as a power of two. */ - for (b = 3, sz = 8; sz && sz < (size + 4); b++, sz <<= 1) + for (b = 3, sz = 8; sz && sz < (size + sizeof (_cmalloc_entry)); + b++, sz <<= 1) continue; cygheap_protect->acquire (); diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index 8fdae5d8e..17bb90136 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -695,6 +695,7 @@ dll_crt0_1 () DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE)) h = NULL; set_myself (mypid, h); + myself->uid = spawn_info->moreinfo->uid; __argc = spawn_info->moreinfo->argc; __argv = spawn_info->moreinfo->argv; envp = spawn_info->moreinfo->envp; @@ -709,7 +710,6 @@ dll_crt0_1 () } if (child_proc_info->subproc_ready) ProtectHandle (child_proc_info->subproc_ready); - myself->uid = spawn_info->moreinfo->uid; if (myself->uid == USHRT_MAX) cygheap->user.set_sid (NULL); break; diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc index 5c7bad339..640623e3b 100644 --- a/winsup/cygwin/fork.cc +++ b/winsup/cygwin/fork.cc @@ -442,7 +442,6 @@ fork_parent (HANDLE& hParent, dll *&first_dll, RevertToSelf (); ch.parent = hParent; - cygheap_setup_for_child (&ch); #ifdef DEBUGGING if (npid_max) { @@ -464,6 +463,7 @@ out: char sa_buf[1024]; syscall_printf ("CreateProcess (%s, %s, 0, 0, 1, %x, 0, 0, %p, %p)", myself->progname, myself->progname, c_flags, &si, &pi); + cygheap_setup_for_child (&ch); rc = CreateProcess (myself->progname, /* image to run */ myself->progname, /* what we send in arg0 */ allow_ntsec ? sec_user (sa_buf) : &sec_none_nih, diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc index 059e070a0..1603f446a 100644 --- a/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc @@ -542,7 +542,8 @@ spawn_guts (HANDLE hToken, const char * prog_arg, const char *const *argv, *c++ = cstrdup1 (*e++); *c = NULL; if (mode != _P_OVERLAY || - !DuplicateHandle (hMainProc, myself.shared_handle (), hMainProc, &ciresrv.moreinfo->myself_pinfo, 0, + !DuplicateHandle (hMainProc, myself.shared_handle (), hMainProc, + &ciresrv.moreinfo->myself_pinfo, 0, TRUE, DUPLICATE_SAME_ACCESS)) ciresrv.moreinfo->myself_pinfo = NULL; @@ -578,8 +579,6 @@ skip_arg_parsing: else envblock = winenv (envp, 0); - cygheap_setup_for_child (&ciresrv); - /* Preallocated buffer for `sec_user' call */ char sa_buf[1024]; @@ -598,6 +597,7 @@ skip_arg_parsing: /* FIXME: This leaks a handle in the CreateProcessAsUser case since the child process doesn't know about cygwin_mount_h. */ ciresrv.mount_h = cygwin_mount_h; + cygheap_setup_for_child (&ciresrv); rc = CreateProcess (runpath, /* image name - with full path */ one_line.buf, /* what was passed to exec */ /* process security attrs */ @@ -652,6 +652,7 @@ skip_arg_parsing: strcat (wstname, dskname); si.lpDesktop = wstname; + cygheap_setup_for_child (&ciresrv); rc = CreateProcessAsUser (hToken, runpath, /* image name - with full path */ one_line.buf, /* what was passed to exec */ -- cgit v1.2.3