summaryrefslogtreecommitdiffstats
path: root/e_os.h
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2018-11-21 11:44:42 +0000
committerMatt Caswell <matt@openssl.org>2018-12-10 10:22:05 +0000
commit99992ad22019e752c7b103a45f860a48b6bc0972 (patch)
tree27aba4b601955a6516397cc41f033df1b8812677 /e_os.h
parent4bd0db1feaaf97fbc2bd31f54f1fbdeab80b2b1a (diff)
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 <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7680) (cherry picked from commit 71b1ceffc4c795f5db21861dd1016fbe23a53a53)
Diffstat (limited to 'e_os.h')
-rw-r--r--e_os.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/e_os.h b/e_os.h
index 534059382b..8e6efa9616 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