diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-13 14:43:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-13 14:43:30 +0100 |
| commit | a3ee252993e8200c856be3fe664937f9461ee268 (patch) | |
| tree | af68e434545e20c538f896e28b73f2db7d626edd /thirdparty/openssl/crypto/ex_data.c | |
| parent | c01575b3125ce1828f0cacb3f9f00286136f373c (diff) | |
| parent | e12c89e8c9896b2e5cdd70dbd2d2acb449ff4b94 (diff) | |
Merge pull request #15664 from akien-mga/thirdparty
Bugfix updates to various thirdparty libraries
Diffstat (limited to 'thirdparty/openssl/crypto/ex_data.c')
| -rw-r--r-- | thirdparty/openssl/crypto/ex_data.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/thirdparty/openssl/crypto/ex_data.c b/thirdparty/openssl/crypto/ex_data.c index 108a1959ea..723b21b3d2 100644 --- a/thirdparty/openssl/crypto/ex_data.c +++ b/thirdparty/openssl/crypto/ex_data.c @@ -473,7 +473,14 @@ static int int_dup_ex_data(int class_index, CRYPTO_EX_DATA *to, if (j < mx) mx = j; if (mx > 0) { - if (!CRYPTO_set_ex_data(to, mx - 1, NULL)) + /* + * Make sure the ex_data stack is at least |mx| elements long to avoid + * issues in the for loop that follows; so go get the |mx|'th element + * (if it does not exist CRYPTO_get_ex_data() returns NULL), and assign + * to itself. This is normally a no-op; but ensures the stack is the + * proper size + */ + if (!CRYPTO_set_ex_data(to, mx - 1, CRYPTO_get_ex_data(to, mx - 1))) goto skip; storage = OPENSSL_malloc(mx * sizeof(CRYPTO_EX_DATA_FUNCS *)); if (!storage) |