diff options
author | Yuchi <yt8mn@virginia.edu> | 2017-02-05 19:33:47 -0500 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2017-02-14 10:27:08 +0000 |
commit | b37fce59cb7c48776361ac8cb8a808793016eefd (patch) | |
tree | 6eda75be64ab79bdc1e90e3ec73e8ae9a05e7d4d /apps | |
parent | 955286c9f38c11b8be719d632fa9267eb13467f8 (diff) |
mem leak on error path and error propagation fix
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2559)
(cherry picked from commit e0670973d5c0b837eb5a9f1670e47107f466fbc7)
Diffstat (limited to 'apps')
-rw-r--r-- | apps/ts.c | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -890,9 +890,15 @@ static TS_VERIFY_CTX *create_verify_ctx(const char *data, const char *digest, goto err; f = TS_VFY_VERSION | TS_VFY_SIGNER; if (data != NULL) { + BIO *out = NULL; + f |= TS_VFY_DATA; - if (TS_VERIFY_CTX_set_data(ctx, BIO_new_file(data, "rb")) == NULL) + if ((out = BIO_new_file(data, "rb")) == NULL) + goto err; + if (TS_VERIFY_CTX_set_data(ctx, out) == NULL) { + BIO_free_all(out); goto err; + } } else if (digest != NULL) { long imprint_len; unsigned char *hexstr = OPENSSL_hexstr2buf(digest, &imprint_len); |