From 71b1ceffc4c795f5db21861dd1016fbe23a53a53 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 21 Nov 2018 11:44:42 +0000 Subject: Make sure build_SYS_str_reasons() preserves errno This function can end up being called during ERR_get_error() if we are initialising. ERR_get_error() must preserve errno since it gets called via SSL_get_error(). If that function returns SSL_ERROR_SYSCALL then you are supposed to inspect errno. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/7680) --- e_os.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'e_os.h') diff --git a/e_os.h b/e_os.h index 6cdd35e6e1..9c0888e436 100644 --- a/e_os.h +++ b/e_os.h @@ -49,6 +49,7 @@ # define get_last_sys_error() errno # define clear_sys_error() errno=0 +# define set_sys_error(e) errno=(e) /******************************************************************** The Microsoft section @@ -66,8 +67,10 @@ # ifdef WIN32 # undef get_last_sys_error # undef clear_sys_error +# undef set_sys_error # define get_last_sys_error() GetLastError() # define clear_sys_error() SetLastError(0) +# define set_sys_error(e) SetLastError(e) # if !defined(WINNT) # define WIN_CONSOLE_BUG # endif -- cgit v1.2.3