diff options
| author | Paul Gardiner <paul.gardiner@artifex.com> | 2018-01-26 16:15:23 +0000 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2018-07-06 13:54:20 +0200 |
| commit | 028d4e030cfba44896be509f4251712652c7272d (patch) | |
| tree | 3042df22526eafa37d62a24604230d63a5c8cc5b | |
| parent | e717674eba31ed19ca1078652843a22f24a96180 (diff) | |
| download | mupdf-028d4e030cfba44896be509f4251712652c7272d.tar.xz | |
Fix bad error handling in pdf_pkcs7_openssl_read_pfx.
Failure within this function could lead to segfaults in drop_signer. The
problem was early allocation of the signer struct without setting its
drop method, so that on error signer was non-null, but not in a state
where drop_signer could be called.
| -rw-r--r-- | source/helpers/pkcs7/pkcs7-openssl.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source/helpers/pkcs7/pkcs7-openssl.c b/source/helpers/pkcs7/pkcs7-openssl.c index 7bbda55e..22d281df 100644 --- a/source/helpers/pkcs7/pkcs7-openssl.c +++ b/source/helpers/pkcs7/pkcs7-openssl.c @@ -671,6 +671,12 @@ pdf_pkcs7_signer *pkcs7_openssl_read_pfx(fz_context *ctx, const char *pfile, con fz_try(ctx) { signer = fz_malloc_struct(ctx, openssl_signer); + signer->base.keep = keep_signer; + signer->base.drop = drop_signer; + signer->base.designated_name = signer_designated_name; + signer->base.drop_designated_name = signer_drop_designated_name; + signer->base.create_digest = signer_create_digest; + signer->ctx = ctx; signer->refs = 1; OpenSSL_add_all_algorithms(); @@ -728,13 +734,6 @@ pdf_pkcs7_signer *pkcs7_openssl_read_pfx(fz_context *ctx, const char *pfile, con if (signer->x509 == NULL) fz_throw(ctx, FZ_ERROR_GENERIC, "Failed to obtain certificate"); - - signer->ctx = ctx; - signer->base.keep = keep_signer; - signer->base.drop = drop_signer; - signer->base.designated_name = signer_designated_name; - signer->base.drop_designated_name = signer_drop_designated_name; - signer->base.create_digest = signer_create_digest; } fz_always(ctx) { |