summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Hogan <doug@acyclic.org>2015-01-07 18:21:01 -0800
committerKurt Roeckx <kurt@roeckx.be>2015-02-22 13:27:19 +0100
commite224c45317b8a78ff52a121aac30ffc1499410c8 (patch)
treec44a889fb730685073bd60da758a532d619ac42c
parente961fa4479cf90a58bc3d3f0db9f1d0385da866f (diff)
downloadopenssl-new-e224c45317b8a78ff52a121aac30ffc1499410c8.tar.gz
Avoid a double-free in an error path.
Signed-off-by: Kurt Roeckx <kurt@roeckx.be> Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 1549a265209d449b6aefd2b49d7d39f7fbe0689b)
-rw-r--r--crypto/dh/dh_ameth.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index 0ba4d4476b..76df91b4e2 100644
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c
@@ -258,6 +258,7 @@ static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
dplen = i2d_ASN1_INTEGER(prkey, &dp);
ASN1_INTEGER_free(prkey);
+ prkey = NULL;
if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_dhKeyAgreement), 0,
V_ASN1_SEQUENCE, params, dp, dplen))