diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-04-30 10:11:07 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-04-30 10:11:07 -0400 |
| commit | 13f70ae2a9734b8eedea337aa947a75d27ed8320 (patch) | |
| tree | 7a2e7dbb4747b573959a973b4ddd306a2e434359 /crypto/err | |
| parent | de46e8246bf30f9d8a6b8a66b37f8bf63115aeb6 (diff) | |
Check fflush on BIO_ctrl call
Bug found and fix suggested by Julian Rüth.
Push error if fflush fails
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3266)
(cherry picked from commit 595b2a42375427a254ad5a8c85870efea839a9b9)
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3348)
Diffstat (limited to 'crypto/err')
| -rw-r--r-- | crypto/err/err.c | 1 | ||||
| -rw-r--r-- | crypto/err/err.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/crypto/err/err.c b/crypto/err/err.c index 52dc9a5ddd..0b1fcfc1f1 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -172,6 +172,7 @@ static ERR_STRING_DATA ERR_str_functs[] = { # endif {ERR_PACK(0, SYS_F_OPENDIR, 0), "opendir"}, {ERR_PACK(0, SYS_F_FREAD, 0), "fread"}, + {ERR_PACK(0, SYS_F_FFLUSH, 0), "fflush"}, {0, NULL}, }; diff --git a/crypto/err/err.h b/crypto/err/err.h index 585aa8ba3d..f42365620d 100644 --- a/crypto/err/err.h +++ b/crypto/err/err.h @@ -258,6 +258,7 @@ typedef struct err_state_st { # define SYS_F_WSASTARTUP 9/* Winsock stuff */ # define SYS_F_OPENDIR 10 # define SYS_F_FREAD 11 +# define SYS_F_FFLUSH 18 /* reasons */ # define ERR_R_SYS_LIB ERR_LIB_SYS/* 2 */ |