# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1435067344 -28800
# Node ID d41c7b967868871040cd1decfccba442d2edf60b
# Parent  54e6954a8ef0d0cc0b54a17bd2a8b8089b217037# Parent  a9e074b78cd5caab6b41c2d6de22f859a0da7193
merge

diff -r 54e6954a8ef0 -r d41c7b967868 common-kex.c
--- a/common-kex.c	Sat Jun 13 23:39:55 2015 +0800
+++ b/common-kex.c	Tue Jun 23 21:49:04 2015 +0800
@@ -703,6 +703,9 @@
 	ecc_key *Q_C, *Q_S, *Q_them;
 
 	Q_them = buf_get_ecc_raw_pubkey(pub_them, algo_kex->ecc_curve);
+	if (Q_them == NULL) {
+		dropbear_exit("ECC error");
+	}
 
 	ses.dh_K = dropbear_ecc_shared_secret(Q_them, &param->key);