diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-02-08 13:14:05 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-02-09 13:01:15 +0000 |
| commit | ba25221226f0c9b033d8ff8a2a2bde8b359c6426 (patch) | |
| tree | 98c7c83b7cc8f6d60571b9937731f15755c7b5b4 /crypto/ex_data.c | |
| parent | 506805e708604efb9448d26e9e94c14cb2d9ccd9 (diff) | |
Fix memory leak reporting.
Free up bio_err after memory leak data has been printed to it.
In int_free_ex_data if ex_data is NULL there is nothing to free up
so return immediately and don't reallocate it.
Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit 9c7a780bbebc1b6d87dc38a6aa3339033911a8bb)
Diffstat (limited to 'crypto/ex_data.c')
| -rw-r--r-- | crypto/ex_data.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/ex_data.c b/crypto/ex_data.c index 5a3546a2d2..f96a51781a 100644 --- a/crypto/ex_data.c +++ b/crypto/ex_data.c @@ -500,6 +500,8 @@ static void int_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad) EX_CLASS_ITEM *item; void *ptr; CRYPTO_EX_DATA_FUNCS **storage = NULL; + if (ex_data == NULL) + return; if ((item = def_get_class(class_index)) == NULL) return; CRYPTO_r_lock(CRYPTO_LOCK_EX_DATA); |