* miscfuncs.cc (thread_wrapper): Remove unused _cygtls record.

* mmap.cc (is_mmapped_region): Avoid crash if no mmaps exist.
This commit is contained in:
Corinna Vinschen 2011-05-17 15:37:01 +00:00
parent 89d3b82ee5
commit 5e3af166d7
3 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2011-05-17 Corinna Vinschen <corinna@vinschen.de>
* miscfuncs.cc (thread_wrapper): Remove unused _cygtls record.
* mmap.cc (is_mmapped_region): Avoid crash if no mmaps exist.
2011-05-16 Corinna Vinschen <corinna@vinschen.de> 2011-05-16 Corinna Vinschen <corinna@vinschen.de>
* globals.cc (__getlogin_username): Remove. * globals.cc (__getlogin_username): Remove.

View File

@ -412,6 +412,7 @@ thread_wrapper (VOID *arg)
it's actually used by the thread function. So what we do here is it's actually used by the thread function. So what we do here is
to compute the stackbase of the application-provided stack, move to compute the stackbase of the application-provided stack, move
_my_tls to the stackbase, and change the stack pointer accordingly. */ _my_tls to the stackbase, and change the stack pointer accordingly. */
_my_tls.remove (0);
wrapper_arg.stackaddr = (PVOID) ((PBYTE) wrapper_arg.stackaddr wrapper_arg.stackaddr = (PVOID) ((PBYTE) wrapper_arg.stackaddr
+ wrapper_arg.stacksize); + wrapper_arg.stacksize);
_tlsbase = (char *) wrapper_arg.stackaddr; _tlsbase = (char *) wrapper_arg.stackaddr;

View File

@ -664,16 +664,18 @@ mmap_areas::del_list (mmap_list *ml)
bool bool
is_mmapped_region (caddr_t start_addr, caddr_t end_address) is_mmapped_region (caddr_t start_addr, caddr_t end_address)
{ {
bool ret = false;
size_t len = end_address - start_addr; size_t len = end_address - start_addr;
LIST_LOCK (); LIST_LOCK ();
mmap_list *map_list = mmapped_areas.get_list_by_fd (-1, NULL); mmap_list *map_list = mmapped_areas.get_list_by_fd (-1, NULL);
if (!map_list)
return false;
mmap_record *rec; mmap_record *rec;
caddr_t u_addr; caddr_t u_addr;
DWORD u_len; DWORD u_len;
bool ret = false;
LIST_FOREACH (rec, &map_list->recs, mr_next) LIST_FOREACH (rec, &map_list->recs, mr_next)
{ {