diff options
| author | Matt Caswell <matt@openssl.org> | 2020-11-06 11:43:44 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-11-19 14:56:58 +0000 |
| commit | 4e08ea6f111d7bdcef0659baca700a78aa867913 (patch) | |
| tree | 3175437f9561940d5191f96a4c71285f0f5909a5 /include | |
| parent | 5b1d94c11c680c2b9527c3da55593468bcf65efd (diff) | |
Allow multiple nested marks
Previously we only ever allowed one mark to be set against an error in the
statck. If we attempted to nest them, then we would end up clearing all
the errors in the stack when we popped to the mark.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13335)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/err.h.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/openssl/err.h.in b/include/openssl/err.h.in index 35db02fad6..1f2fde8317 100644 --- a/include/openssl/err.h.in +++ b/include/openssl/err.h.in @@ -56,6 +56,7 @@ extern "C" { # define ERR_NUM_ERRORS 16 struct err_state_st { int err_flags[ERR_NUM_ERRORS]; + int err_marks[ERR_NUM_ERRORS]; unsigned long err_buffer[ERR_NUM_ERRORS]; char *err_data[ERR_NUM_ERRORS]; size_t err_data_size[ERR_NUM_ERRORS]; |