From: Matt Caswell Date: Sun, 11 Oct 2015 15:17:27 +0000 (+0100) Subject: Fix bug in async_fibre_makecontext for POSIX X-Git-Tag: OpenSSL_1_1_0-pre1~215 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90fa7296c22583a0a42203b078979bbfb2fcb11d;p=openssl Fix bug in async_fibre_makecontext for POSIX async_fibre_makecontext was initialise the fibre first and then calling getcontext(). It should be the other way around because the getcontext call may overwrite some of the things we just initialised. This didn't cause an issue on Linux and so the problem went unnoticed. On OS-X it causes a crash. Reviewed-by: Rich Salz --- diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h index aac12f1644..0f91464713 100644 --- a/crypto/async/arch/async_posix.h +++ b/crypto/async/arch/async_posix.h @@ -97,8 +97,8 @@ static inline int async_fibre_swapcontext(async_fibre *o, async_fibre *n, int r) } # define async_fibre_makecontext(c) \ - (async_fibre_init(c) \ - && !getcontext(&(c)->fibre) \ + (!getcontext(&(c)->fibre) \ + && async_fibre_init(c) \ && (makecontext(&(c)->fibre, async_start_func, 0), 1)) # define async_fibre_init_dispatcher(d)