From 01b49f835da59f2416cc21816a000d054186a268 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 20 May 2011 19:00:51 +0000 Subject: [PATCH] * miscfuncs.cc (CygwinCreateThread): Fix condition for adding the guardsize to the stacksize. Fix accompanying comment. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/miscfuncs.cc | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 09fe1ea59..92c2fead5 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2011-05-20 Corinna Vinschen + + * miscfuncs.cc (CygwinCreateThread): Fix condition for adding the + guardsize to the stacksize. Fix accompanying comment. + 2011-05-20 Corinna Vinschen * miscfuncs.cc (CygwinCreateThread): Add accidentally missing comment. diff --git a/winsup/cygwin/miscfuncs.cc b/winsup/cygwin/miscfuncs.cc index 98db1f591..dde06bffb 100644 --- a/winsup/cygwin/miscfuncs.cc +++ b/winsup/cygwin/miscfuncs.cc @@ -541,11 +541,9 @@ CygwinCreateThread (LPTHREAD_START_ROUTINE thread_func, PVOID thread_arg, ? guardsize : wincap.page_size (); if (real_guardsize) real_guardsize = roundup2 (real_guardsize, wincap.page_size ()); - /* If the default stacksize is used and guardsize has not been specified, - don't add a guard page to the size. Same if stacksize is only - PTHREAD_STACK_MIN. */ - if (stacksize && guardsize != (ULONG) -1 - && real_stacksize > PTHREAD_STACK_MIN) + /* Add the guardsize to the stacksize, but only if the stacksize and + the guardsize have been explicitely specified. */ + if (stacksize || guardsize != (ULONG) -1) real_stacksize += real_guardsize; /* Now roundup the result to the next allocation boundary. */ real_stacksize = roundup2 (real_stacksize,