aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto/c_src/crypto.c
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-08-09 17:28:31 +0200
committerErlang/OTP <[email protected]>2018-08-09 17:28:31 +0200
commita076883bc29832dc6f2c2a465781440abf4effdb (patch)
tree8f78aa0c660c1a0fbe29f7dfd2688156cd5f35a6 /lib/crypto/c_src/crypto.c
parent4800273fc10934eac12411f7b613a57c76262157 (diff)
parent806a409df7cf2b07a39b3876fd36099579df126a (diff)
downloadotp-a076883bc29832dc6f2c2a465781440abf4effdb.tar.gz
otp-a076883bc29832dc6f2c2a465781440abf4effdb.tar.bz2
otp-a076883bc29832dc6f2c2a465781440abf4effdb.zip
Merge branch 'john/crypto/fix-segfault-on-badarg/OTP-15194/ERL-673' into maint-20
* john/crypto/fix-segfault-on-badarg/OTP-15194/ERL-673: crypto: Fix crash in compute_key(ecdh, ...) on badarg
Diffstat (limited to 'lib/crypto/c_src/crypto.c')
-rw-r--r--lib/crypto/c_src/crypto.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 94a207cba6..6e855939f7 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -3757,7 +3757,7 @@ static ERL_NIF_TERM ecdh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF
int i;
EC_GROUP *group;
const BIGNUM *priv_key;
- EC_POINT *my_ecpoint;
+ EC_POINT *my_ecpoint = NULL;
EC_KEY *other_ecdh = NULL;
if (!get_ec_key(env, argv[1], argv[2], atom_undefined, &key))