From 94ae7cbf83a34456e5cad721f61ea77fcc023a3f Mon Sep 17 00:00:00 2001 From: Elichai Turkel Date: Tue, 2 Jul 2019 19:18:56 -0400 Subject: [PATCH] Moved a dereference so the null check will be before the dereferencing --- src/ecmult_impl.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ecmult_impl.h b/src/ecmult_impl.h index bb7adedfb1f0d..d1a00f600bd48 100644 --- a/src/ecmult_impl.h +++ b/src/ecmult_impl.h @@ -395,7 +395,7 @@ static void secp256k1_ecmult_context_clear(secp256k1_ecmult_context *ctx) { * than the number of bits in the (absolute value) of the input. */ static int secp256k1_ecmult_wnaf(int *wnaf, int len, const secp256k1_scalar *a, int w) { - secp256k1_scalar s = *a; + secp256k1_scalar s; int last_set_bit = -1; int bit = 0; int sign = 1; @@ -408,6 +408,7 @@ static int secp256k1_ecmult_wnaf(int *wnaf, int len, const secp256k1_scalar *a, memset(wnaf, 0, len * sizeof(wnaf[0])); + s = *a; if (secp256k1_scalar_get_bits(&s, 255, 1)) { secp256k1_scalar_negate(&s, &s); sign = -1;