projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix a failure to NULL a pointer freed on error.
[openssl.git]
/
crypto
/
ec
/
ec_asn1.c
diff --git
a/crypto/ec/ec_asn1.c
b/crypto/ec/ec_asn1.c
index 30b7df4850211efa73a332ab9b9093381cc3d99e..d3e8316ffb40d07aaca2c540abb88b566dfc4e2a 100644
(file)
--- a/
crypto/ec/ec_asn1.c
+++ b/
crypto/ec/ec_asn1.c
@@
-1014,8
+1014,6
@@
EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
ECerr(EC_F_D2I_ECPRIVATEKEY, ERR_R_MALLOC_FAILURE);
goto err;
}
- if (a)
- *a = ret;
} else
ret = *a;
@@
-1067,10
+1065,12
@@
EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
}
}
+ if (a)
+ *a = ret;
ok = 1;
err:
if (!ok) {
- if (ret)
+ if (ret
&& (a == NULL || *a != ret)
)
EC_KEY_free(ret);
ret = NULL;
}